Skip to content

Commit 60f3250

Browse files
committed
Use reference in arguments where possible
Closes #6
1 parent 854b690 commit 60f3250

27 files changed

+3984
-3077
lines changed

lib/nostr_sdk.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export 'src/rust/api/protocol/key.dart';
1111
export 'src/rust/api/protocol/key/public_key.dart';
1212
export 'src/rust/api/protocol/key/secret_key.dart';
1313
export 'src/rust/api/protocol/nips/nip59.dart';
14-
export 'src/rust/api/protocol/types/filter.dart';
14+
export 'src/rust/api/protocol/filter.dart';
1515
export 'src/rust/api/protocol/signer.dart';
1616
export 'src/rust/api/relay/options.dart';
1717
export 'src/rust/api/client.dart';

lib/src/rust/api/client.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'client/output.dart';
1010
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
1111
import 'protocol/event.dart';
1212
import 'protocol/event/builder.dart';
13+
import 'protocol/filter.dart';
1314
import 'protocol/signer.dart';
14-
import 'protocol/types/filter.dart';
1515
import 'relay/options.dart';
1616

1717
// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `from`

lib/src/rust/api/protocol/types/filter.dart renamed to lib/src/rust/api/protocol/filter.dart

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
55

6-
import '../../../frb_generated.dart';
7-
import '../event.dart';
8-
import '../event/id.dart';
9-
import '../key/public_key.dart';
6+
import '../../frb_generated.dart';
7+
import 'event.dart';
8+
import 'event/id.dart';
9+
import 'key/public_key.dart';
1010
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
1111

1212
// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `from`, `from`, `from`
@@ -29,8 +29,8 @@ abstract class Filter implements RustOpaqueInterface {
2929
/// Add event IDs (`e` tag)
3030
Filter events({required List<EventId> ids});
3131

32-
static Filter fromJson({required String json}) => NostrSdk.instance.api
33-
.crateApiProtocolTypesFilterFilterFromJson(json: json);
32+
static Filter fromJson({required String json}) =>
33+
NostrSdk.instance.api.crateApiProtocolFilterFilterFromJson(json: json);
3434

3535
Filter hashtag({required String hashtag});
3636

@@ -55,8 +55,7 @@ abstract class Filter implements RustOpaqueInterface {
5555
/// Determine if `Filter` match given `Event`.
5656
bool matchEvent({required Event event});
5757

58-
factory Filter() =>
59-
NostrSdk.instance.api.crateApiProtocolTypesFilterFilterNew();
58+
factory Filter() => NostrSdk.instance.api.crateApiProtocolFilterFilterNew();
6059

6160
/// Add Public Key (`p` tag)
6261
Filter pubkey({required PublicKey pubkey});
@@ -112,13 +111,13 @@ abstract class SingleLetterTag implements RustOpaqueInterface {
112111

113112
/// New lowercase single-letter tag
114113
static SingleLetterTag lowercase({required Alphabet character}) =>
115-
NostrSdk.instance.api.crateApiProtocolTypesFilterSingleLetterTagLowercase(
116-
character: character);
114+
NostrSdk.instance.api
115+
.crateApiProtocolFilterSingleLetterTagLowercase(character: character);
117116

118117
/// New uppercase single-letter tag
119118
static SingleLetterTag uppercase({required Alphabet character}) =>
120-
NostrSdk.instance.api.crateApiProtocolTypesFilterSingleLetterTagUppercase(
121-
character: character);
119+
NostrSdk.instance.api
120+
.crateApiProtocolFilterSingleLetterTagUppercase(character: character);
122121
}
123122

124123
enum Alphabet {

lib/src/rust/api/protocol/key/public_key.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import '../../../frb_generated.dart';
77
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
88

99
// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `deref`, `from`
10-
// These functions have error during generation (see debug logs or enable `stop_on_error: true` for more details): `to_bytes`
1110

1211
// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<_PublicKey>>
1312
abstract class PublicKey implements RustOpaqueInterface {
@@ -23,6 +22,9 @@ abstract class PublicKey implements RustOpaqueInterface {
2322
/// Serialize to bech32
2423
String toBech32();
2524

25+
/// Serialize to bytes
26+
Uint8List toBytes();
27+
2628
/// Serialize to hex
2729
String toHex();
2830

lib/src/rust/api/protocol/key/secret_key.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import '../../../frb_generated.dart';
77
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
88

9-
// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `from`, `from`
9+
// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `from`
1010
// These functions have error during generation (see debug logs or enable `stop_on_error: true` for more details): `to_secret_bytes`
1111

1212
// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<_SecretKey>>

lib/src/rust/api/protocol/signer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ abstract class NostrSigner implements RustOpaqueInterface {
3636

3737
/// Decrypt
3838
Future<String> nip44Decrypt(
39-
{required PublicKey publicKey, required String payload});
39+
{required PublicKey publicKey, required String content});
4040

4141
/// Encrypt
4242
Future<String> nip44Encrypt(

0 commit comments

Comments
 (0)