Skip to content

Commit 8d5cd8f

Browse files
committed
refactor(spl) "spl"->"sol" where appropriate
1 parent 70e42e8 commit 8d5cd8f

File tree

28 files changed

+356
-329
lines changed

28 files changed

+356
-329
lines changed

lib/db/isar/main_db.dart

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class MainDB {
5959
AddressSchema,
6060
AddressLabelSchema,
6161
EthContractSchema,
62-
SplTokenSchema,
62+
SolContractSchema,
6363
TransactionBlockExplorerSchema,
6464
StackThemeSchema,
6565
ContactEntrySchema,
@@ -628,20 +628,21 @@ class MainDB {
628628

629629
// Solana tokens.
630630

631-
QueryBuilder<SplToken, SplToken, QWhere> getSplTokens() =>
632-
isar.splTokens.where();
631+
QueryBuilder<SolContract, SolContract, QWhere> getSolContracts() =>
632+
isar.solContracts.where();
633633

634-
Future<SplToken?> getSplToken(String tokenMint) =>
635-
isar.splTokens.where().addressEqualTo(tokenMint).findFirst();
634+
Future<SolContract?> getSolContract(String tokenMint) =>
635+
isar.solContracts.where().addressEqualTo(tokenMint).findFirst();
636636

637-
SplToken? getSplTokenSync(String tokenMint) =>
638-
isar.splTokens.where().addressEqualTo(tokenMint).findFirstSync();
637+
SolContract? getSolContractSync(String tokenMint) =>
638+
isar.solContracts.where().addressEqualTo(tokenMint).findFirstSync();
639639

640-
Future<int> putSplToken(SplToken token) => isar.writeTxn(() async {
641-
return await isar.splTokens.put(token);
640+
Future<int> putSolContract(SolContract token) => isar.writeTxn(() async {
641+
return await isar.solContracts.put(token);
642642
});
643643

644-
Future<void> putSplTokens(List<SplToken> tokens) => isar.writeTxn(() async {
645-
await isar.splTokens.putAll(tokens);
646-
});
644+
Future<void> putSolContracts(List<SolContract> tokens) =>
645+
isar.writeTxn(() async {
646+
await isar.solContracts.putAll(tokens);
647+
});
647648
}

lib/models/add_wallet_list_entity/sub_classes/sol_token_entity.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*
88
*/
99

10-
import '../add_wallet_list_entity.dart';
11-
import '../../isar/models/solana/spl_token.dart';
1210
import '../../../wallets/crypto_currency/crypto_currency.dart';
11+
import '../../isar/models/solana/sol_contract.dart';
12+
import '../add_wallet_list_entity.dart';
1313

1414
class SolTokenEntity extends AddWalletListEntity {
1515
SolTokenEntity(this.token);
1616

17-
final SplToken token;
17+
final SolContract token;
1818

1919
@override
2020
CryptoCurrency get cryptoCurrency => Solana(CryptoCurrencyNetwork.main);

lib/models/isar/models/isar_models.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ export 'blockchain_data/transaction.dart';
1616
export 'blockchain_data/utxo.dart';
1717
export 'ethereum/eth_contract.dart';
1818
export 'log.dart';
19-
export 'solana/spl_token.dart';
19+
export 'solana/sol_contract.dart';
2020
export 'transaction_note.dart';
2121
export '../../../wallets/isar/models/wallet_solana_token_info.dart';

lib/models/isar/models/solana/spl_token.dart renamed to lib/models/isar/models/solana/sol_contract.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import 'package:isar_community/isar.dart';
1111

1212
import '../contract.dart';
1313

14-
part 'spl_token.g.dart';
14+
part 'sol_contract.g.dart';
1515

1616
@collection
17-
class SplToken extends Contract {
18-
SplToken({
17+
class SolContract extends Contract {
18+
SolContract({
1919
required this.address,
2020
required this.name,
2121
required this.symbol,
@@ -43,15 +43,15 @@ class SplToken extends Contract {
4343

4444
late final String? metadataAddress;
4545

46-
SplToken copyWith({
46+
SolContract copyWith({
4747
Id? id,
4848
String? address,
4949
String? name,
5050
String? symbol,
5151
int? decimals,
5252
String? logoUri,
5353
String? metadataAddress,
54-
}) => SplToken(
54+
}) => SolContract(
5555
address: address ?? this.address,
5656
name: name ?? this.name,
5757
symbol: symbol ?? this.symbol,

0 commit comments

Comments
 (0)