Skip to content

Commit 4871d48

Browse files
author
vacwmX
committed
fix: fixing imports
1 parent 41ef4de commit 4871d48

File tree

7 files changed

+80
-98
lines changed

7 files changed

+80
-98
lines changed

‎.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
name: setup
2626
runs-on: ubuntu-latest
2727
outputs:
28-
sdk-ref: ${{ inputs.sdk-ref || '0.2.14' }}
28+
sdk-ref: ${{ inputs.sdk-ref || '19e614db145d9e8190999bc9fc9aada39a6a4a4d' }}
2929
package-version: '0.2.14'
3030
steps:
3131
- run: echo "set pre-setup output variables"
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
repository: breez/breez-sdk
3939
ref: ${{ needs.setup.outputs.sdk-ref }}
40-
package-version: ${{ needs.setup.outputs.package-version }}
40+
# package-version: ${{ needs.setup.outputs.package-version }}
4141
packages-to-publish: '["csharp", "flutter", "golang", "react-native", "python"]'
4242
use-dummy-binaries: true
4343

‎snippets/csharp/Metadata.cs

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Breez.Sdk;
22
using System.Text.Json;
33

4-
public class ServiceStatusSnippets
4+
public class MetadataSnippets
55
{
66
public void SetPaymentMetadata(BlockingBreezServices sdk)
77
{
@@ -15,16 +15,16 @@ public void FilterPaymentMetadata(BlockingBreezServices sdk)
1515
// ANCHOR: filter-payment-metadata
1616
try
1717
{
18-
MetadataFilter[] metadataFilters = {
18+
var metadataFilters = new List<MetadataFilter>(
1919
new MetadataFilter(
2020
jsonPath: "myCustomValue",
21-
jsonValue: "true",
22-
),
23-
};
21+
jsonValue: "true"
22+
)
23+
);
2424

25-
var payments = ListPayments(
25+
var payments = sdk.ListPayments(
2626
new ListPaymentsRequest(
27-
metadataFilters: metadataFilters,
27+
metadataFilters: metadataFilters
2828
)
2929
);
3030
}
@@ -36,43 +36,43 @@ public void FilterPaymentMetadata(BlockingBreezServices sdk)
3636
}
3737

3838
public void FilterPaymentMetadataString(BlockingBreezServices sdk)
39-
{
39+
{
4040
// ANCHOR: filter-payment-metadata-string
41-
MetadataFilter[] metadataFilters = {
41+
var metadataFilters = new List<MetadataFilter>(
4242
new MetadataFilter(
4343
jsonPath: "customerName",
44-
jsonValue: "\"Satoshi Nakamoto\"",
44+
jsonValue: "\"Satoshi Nakamoto\""
4545
),
4646
new MetadataFilter(
4747
jsonPath: "customerName",
48-
jsonValue: JsonSerializer.Serialize("Satoshi Nakamoto"),
49-
),
50-
};
48+
jsonValue: JsonSerializer.Serialize("Satoshi Nakamoto")
49+
)
50+
);
5151
// ANCHOR_END: filter-payment-metadata-string
5252
}
5353

5454
public void FilterPaymentMetadataObject(BlockingBreezServices sdk)
55-
{
55+
{
5656
// ANCHOR: filter-payment-metadata-object
5757
// This will *NOT* work
58-
MetadataFilter[] metadataFilters = {
58+
var _metadataFilters = new List<MetadataFilter>(
5959
new MetadataFilter(
6060
jsonPath: "parent.nestedArray",
61-
jsonValue: "[1, 2, 3]",
62-
),
63-
};
61+
jsonValue: "[1, 2, 3]"
62+
)
63+
);
6464

6565
// This will work
66-
MetadataFilter[] metadataFilters = {
66+
var metadataFilters = new List<MetadataFilter>(
6767
new MetadataFilter(
6868
jsonPath: "parent.nestedArray",
69-
jsonValue: "[1,2,3]",
69+
jsonValue: "[1,2,3]"
7070
),
7171
new MetadataFilter(
7272
jsonPath: "parent.nestedArray",
73-
jsonValue: JsonSerializer.Serialize(new int[] {1, 2, 3}),
74-
),
75-
};
73+
jsonValue: JsonSerializer.Serialize(new int[] {1, 2, 3})
74+
)
75+
);
7676
// ANCHOR_END: filter-payment-metadata-object
7777
}
7878
}

‎snippets/dart_snippets/lib/metadata.dart

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:breez_sdk/breez_sdk.dart';
2+
import 'package:breez_sdk/bridge_generated.dart';
23

34
Future<void> setPaymentMetadata({required String paymentHash, required String metadata}) async {
45
// ANCHOR: set-payment-metadata
@@ -15,15 +16,16 @@ Future<void> filterPaymentMetadata() async {
1516
),
1617
];
1718

18-
await BreezSDK().listPayments(ListPaymentsRequest(
19-
metadataFilters: metadataFilters
20-
)).catchError((_err) {
19+
await BreezSDK().listPayments(
20+
req: ListPaymentsRequest(
21+
metadataFilters: metadataFilters
22+
)).catchError((_) {
2123
// handle error
2224
});
2325
// ANCHOR_END: filter-payment-metadata
2426

2527
// ANCHOR: filter-payment-metadata-string
26-
List<MetadataFilter> metadataFilters = [
28+
metadataFilters = [
2729
MetadataFilter(
2830
jsonPath: "customerName",
2931
jsonValue: '"Satoshi Nakamoto"',
@@ -33,15 +35,15 @@ Future<void> filterPaymentMetadata() async {
3335

3436
// ANCHOR: filter-payment-metadata-object
3537
// This will *NOT* work
36-
List<MetadataFilter> metadataFilters = [
38+
metadataFilters = [
3739
MetadataFilter(
3840
jsonPath: "parent.nestedArray",
3941
jsonValue: "[1, 2, 3]",
4042
),
4143
];
4244

4345
// This will work
44-
List<MetadataFilter> metadataFilters = [
46+
metadataFilters = [
4547
MetadataFilter(
4648
jsonPath: "parent.nestedArray",
4749
jsonValue: "[1,2,3]",

‎snippets/go/metadata.go

+18-19
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ func SetPaymentMetadata() {
1515

1616
func FilterPaymentMetadata() {
1717
// ANCHOR: filter-payment-metadata
18-
metadataFilters := []breez_sdk.PaymentMetadata {
19-
{ JsonPath: "myCustomValue", JsonValue: "true" },
18+
metadataFilters := []breez_sdk.MetadataFilter{
19+
{JsonPath: "myCustomValue", JsonValue: "true"},
2020
}
2121

2222
payments, err := sdk.ListPayments(breez_sdk.ListPaymentsRequest{
23-
MetadataFilters: &metadataFilters,
24-
});
23+
MetadataFilters: &metadataFilters,
24+
})
2525

2626
if err != nil {
2727
// handle error
@@ -30,44 +30,43 @@ func FilterPaymentMetadata() {
3030
log.Printf("%#v", payments)
3131
}
3232

33-
3433
func FilterPaymentMetadataString() {
3534
// ANCHOR: filter-payment-metadata-string
36-
metadataFilters := []breez_sdk.PaymentMetadata {
37-
{ JsonPath: "customerName", JsonValue: "\"Satoshi Nakamoto\"" },
35+
metadataFilters := []breez_sdk.MetadataFilter{
36+
{JsonPath: "customerName", JsonValue: "\"Satoshi Nakamoto\""},
3837
}
3938

4039
jsonValue, _ := json.Marshal("Satoshi Nakamoto")
41-
metadataFilters = []breez_sdk.PaymentMetadata {
42-
{
43-
JsonPath: "customerName",
44-
JsonValue: string(jsonValue),
45-
},
40+
metadataFilters = []breez_sdk.MetadataFilter{
41+
{
42+
JsonPath: "customerName",
43+
JsonValue: string(jsonValue),
44+
},
4645
}
4746
// ANCHOR_END: filter-payment-metadata-string
4847

4948
sdk.ListPayments(breez_sdk.ListPaymentsRequest{
50-
MetadataFilters: &metadataFilters,
49+
MetadataFilters: &metadataFilters,
5150
})
5251
}
5352

5453
func FilterPaymentMetadataObject() {
5554
// ANCHOR: filter-payment-metadata-object
5655
// This will *NOT* work
57-
metadataFilters := []breez_sdk.PaymentMetadata {
58-
{ JsonPath: "parent.nestedArray", JsonValue: "[1, 2, 3]" },
56+
metadataFilters := []breez_sdk.MetadataFilter{
57+
{JsonPath: "parent.nestedArray", JsonValue: "[1, 2, 3]"},
5958
}
6059

6160
// This will work
6261
jsonValue, _ := json.Marshal([]int{1, 2, 3})
6362

64-
metadataFilters = []breez_sdk.PaymentMetadata {
65-
{ JsonPath: "parent.nestedArray", JsonValue: "[1,2,3]" },
66-
{ JsonPath: "parent.nestedArray", JsonValue: string(jsonValue) },
63+
metadataFilters = []breez_sdk.MetadataFilter{
64+
{JsonPath: "parent.nestedArray", JsonValue: "[1,2,3]"},
65+
{JsonPath: "parent.nestedArray", JsonValue: string(jsonValue)},
6766
}
6867
// ANCHOR_END: filter-payment-metadata-object
6968

7069
sdk.ListPayments(breez_sdk.ListPaymentsRequest{
71-
MetadataFilters: &metadataFilters,
70+
MetadataFilters: &metadataFilters,
7271
})
7372
}

‎snippets/python/src/metadata.py

+6-25
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ def set_payment_metadata(sdk_services):
1212
def filter_payment_metadata(sdk_services):
1313
# ANCHOR: filter-payment-metadata
1414
metadata_filters = [
15-
breez_sdk.MetadataFilter(
16-
json_path: "myCustomValue",
17-
json_value: "true",
18-
)
15+
breez_sdk.MetadataFilter("myCustomValue", "true")
1916
]
2017

2118
try:
@@ -29,36 +26,20 @@ def filter_payment_metadata(sdk_services):
2926

3027
# ANCHOR: filter-payment-metadata-string
3128
metadata_filters = [
32-
breez_sdk.MetadataFilter(
33-
json_path: "customerName",
34-
json_value: '"true"',
35-
),
36-
breez_sdk.MetadataFilter(
37-
json_path: "customerName",
38-
json_value: json.dumps("true"),
39-
)
29+
breez_sdk.MetadataFilter("customerName", "\"Satoshi Nakamoto\""),
30+
breez_sdk.MetadataFilter("customerName", json.dumps("Satoshi Nakamoto")),
4031
]
4132
# ANCHOR_END: filter-payment-metadata-string
4233

4334
# ANCHOR: filter-payment-metadata-object
4435
# This will *NOT* work
4536
metadata_filters = [
46-
breez_sdk.MetadataFilter(
47-
json_path: "parent.nestedArray",
48-
json_value: '[1, 2, 3]',
49-
)
37+
breez_sdk.MetadataFilter("parent.nestedArray", "[1, 2, 3]")
5038
]
5139

5240
# This will work
5341
metadata_filters = [
54-
breez_sdk.MetadataFilter(
55-
json_path: "parent.nestedArray",
56-
json_value: '[1,2,3]',
57-
),
58-
breez_sdk.MetadataFilter(
59-
json_path: "parent.nestedArray",
60-
json_value: json.dumps([1,2,3], separators=(',', ':'))
61-
),
62-
42+
breez_sdk.MetadataFilter("parent.nestedArray", "[1,2,3]"),
43+
breez_sdk.MetadataFilter("parent.nestedArray", json.dumps([1,2,3], separators=(',', ':'))),
6344
]
6445
# ANCHOR_END: filter-payment-metadata-object

‎snippets/react-native/metadata.ts

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
import { setPaymentMetadata, listPayments } from '@breeztech/react-native-breez-sdk'
22

3-
const setPaymentMetadata = async () => {
3+
const testSetPaymentMetadata = async () => {
44
// ANCHOR: set-payment-metadata
5-
await setPaymentMetadata('target-payment-hash', `{"myCustomValue":true}`)
5+
await setPaymentMetadata('target-payment-hash', '{"myCustomValue":true}')
66
// ANCHOR_END: set-payment-metadata
77
}
88

9-
const filterPaymentMetadata = async () => {
9+
const testFilterPaymentMetadata = async () => {
1010
// ANCHOR: filter-payment-metadata
11-
let metadataFilters = [
11+
const metadataFilters = [
1212
{
13-
jsonPath: "myCustomValue",
14-
jsonValue: "true"
13+
jsonPath: 'myCustomValue',
14+
jsonValue: 'true'
1515
}
1616
]
1717

1818
try {
1919
await listPayments({
2020
metadataFilters
2121
})
22-
} catch(err) {
22+
} catch (err) {
2323
// handle error
2424
}
2525
// ANCHOR_END: filter-payment-metadata
2626
}
2727

28-
const filterPaymentMetadataString = async () => {
28+
const testFilterPaymentMetadataString = async () => {
2929
// ANCHOR: filter-payment-metadata-string
3030
// Note: These are equivalent
3131
const metadataFilters = [
3232
{
33-
jsonPath: "customerName",
34-
jsonValue: "Satoshi Nakamoto",
33+
jsonPath: 'customerName',
34+
jsonValue: 'Satoshi Nakamoto'
3535
},
3636
{
37-
jsonPath: "customerName",
38-
jsonValue: JSON.stringify("Satoshi Nakamoto"),
39-
},
37+
jsonPath: 'customerName',
38+
jsonValue: JSON.stringify('Satoshi Nakamoto')
39+
}
4040
]
4141
// ANCHOR_END: filter-payment-metadata-string
4242
}
4343

44-
const filterPaymentMetadataObject = async () => {
44+
const testFilterPaymentMetadataObject = async () => {
4545
// ANCHOR: filter-payment-metadata-object
4646
// This will *NOT* work
4747
const _metadataFilters = [
4848
{
49-
jsonPath: "parent.nestedArray",
50-
jsonValue: "[1, 2, 3]",
51-
},
49+
jsonPath: 'parent.nestedArray',
50+
jsonValue: '[1, 2, 3]'
51+
}
5252
]
5353

5454
// This will work
5555
const metadataFilters = [
5656
{
57-
jsonPath: "parent.nestedArray",
58-
jsonValue: "[1,2,3]",
57+
jsonPath: 'parent.nestedArray',
58+
jsonValue: '[1,2,3]'
5959
},
6060
{
61-
jsonPath: "parent.nestedArray",
62-
jsonValue: JSON.stringify([1, 2, 3]),
63-
},
61+
jsonPath: 'parent.nestedArray',
62+
jsonValue: JSON.stringify([1, 2, 3])
63+
}
6464
]
6565
// ANCHOR_END: filter-payment-metadata-object
6666
}

‎snippets/rust/src/receive_onchain.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async fn get_channel_opening_fees(sdk: Arc<BreezServices>, amount_msat: u64) ->
5959
// ANCHOR: get-channel-opening-fees
6060
let channel_fees = sdk
6161
.open_channel_fee(OpenChannelFeeRequest {
62-
amount_msat,
62+
amount_msat: Some(amount_msat),
6363
expiry: None,
6464
})
6565
.await?;

0 commit comments

Comments
 (0)