diff --git a/packages/tfchain_client/pubspec.lock b/packages/tfchain_client/pubspec.lock index eae0f2a5..7fbb3399 100644 --- a/packages/tfchain_client/pubspec.lock +++ b/packages/tfchain_client/pubspec.lock @@ -516,11 +516,9 @@ packages: signer: dependency: "direct main" description: - path: "packages/signer" - ref: main_fix_urls - resolved-ref: d5204d4a5af4f1fbf80334db8039e17f9e323161 - url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" - source: git + path: "../signer" + relative: true + source: path version: "0.1.0" source_map_stack_trace: dependency: transitive diff --git a/packages/tfchain_client/test/balances_test.dart b/packages/tfchain_client/test/balances_test.dart index b6ca63c4..983b9839 100644 --- a/packages/tfchain_client/test/balances_test.dart +++ b/packages/tfchain_client/test/balances_test.dart @@ -5,18 +5,16 @@ import 'package:tfchain_client/generated/dev/types/frame_system/account_info.dar import 'package:tfchain_client/tfchain_client.dart'; import 'package:bip39/bip39.dart' as bip39; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Balances Tests", () { - final setupManager = SetupManager(); + late SetupManager setupManager; late final String recipientAddress; late final Client alice; - setUpAll(() async { - setupManager.setInitializationFlags(client: true); - await setupManager.setup(); - + setupManager = await getSetupManager(); final mnemonic = bip39.generateMnemonic(); final recipientClient = Client(setupManager.url, mnemonic, setupManager.type); @@ -30,13 +28,13 @@ void main() { address: setupManager.client.address, amount: setupManager.myBalance); }); - test('Test Get Balance', () async { + test('Get balance', () async { AccountInfo? accountInfo = await setupManager.client.balances .get(address: setupManager.myAddress); expect(accountInfo, isNotNull); }); - test('Test Get Balance with Invalid address', () async { + test('Get balance with invalid address', () async { try { AccountInfo? accountInfo = await setupManager.client.balances.get(address: "invalidAddress"); @@ -46,7 +44,7 @@ void main() { } }); - test('Test Transfer TFTs with invalid amount', () async { + test('Transfer TFTs with invalid amount', () async { try { await setupManager.client.balances .transfer(address: recipientAddress, amount: 0); @@ -55,7 +53,7 @@ void main() { } }); - test('Test Transfer TFTs', () async { + test('Transfer TFTs', () async { try { var random = Random(); var randomNumber = random.nextInt(1000) + 1; @@ -75,7 +73,7 @@ void main() { } }); - test('Test get my balance', () async { + test('Get my balance', () async { AccountInfo? info = await setupManager.client.balances.getMyBalance(); expect(info, isNotNull); }); diff --git a/packages/tfchain_client/test/client_test.dart b/packages/tfchain_client/test/client_test.dart index 4e0979e8..08b9e80d 100644 --- a/packages/tfchain_client/test/client_test.dart +++ b/packages/tfchain_client/test/client_test.dart @@ -12,14 +12,14 @@ import 'package:tfchain_client/src/tft_bridge.dart'; import 'package:tfchain_client/src/tft_price.dart'; import 'package:tfchain_client/src/twins.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group('Client Tests', () { - final setupManager = SetupManager(); + late SetupManager setupManager; setUpAll(() async { - setupManager.setInitializationFlags(queryClient: true, client: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); test('Initialization', () { diff --git a/packages/tfchain_client/test/contracts_test.dart b/packages/tfchain_client/test/contracts_test.dart index 32dc9a6a..04fbf6ae 100644 --- a/packages/tfchain_client/test/contracts_test.dart +++ b/packages/tfchain_client/test/contracts_test.dart @@ -2,18 +2,18 @@ import 'package:test/test.dart'; import 'package:tfchain_client/generated/dev/types/pallet_smart_contract/types/contract.dart'; import 'package:tfchain_client/generated/dev/types/pallet_smart_contract/types/contract_lock.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Contracts Tests", () { - final setupManager = SetupManager(); + late SetupManager setupManager; setUpAll(() async { - setupManager.setInitializationFlags(client: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); List contractIds = []; - test('Test Get Contract with wrong id', () async { + test('Get Contract with wrong id', () async { try { Contract? contract = await setupManager.client.contracts .get(contractId: BigInt.from(-100)); @@ -23,7 +23,7 @@ void main() { } }); - test('Test Get Contract Id by active rent for invalid node id', () async { + test('Get Contract Id by active rent for invalid node id', () async { try { BigInt? contractId = await setupManager.client.contracts .getContractIdByActiveRentForNode(nodeId: -21); @@ -33,7 +33,7 @@ void main() { } }); - test('Test Get Active Contracts by wrong node Id', () async { + test('Get active contracts by wrong node id', () async { try { List contracts = await setupManager.client.contracts.getActiveContracts(nodeId: -21); @@ -43,7 +43,7 @@ void main() { } }); - test('Test Get Contract Lock by deleted Contract Id', () async { + test('Get contract lock by deleted contract id', () async { try { final name = generateRandomString(7); BigInt? contractId = @@ -58,7 +58,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 50))); - test('Test Update Node Contract with wrong data', () async { + test('Update node contract with wrong data', () async { try { await setupManager.client.contracts.updateNode( contractId: BigInt.from(-200), @@ -69,7 +69,7 @@ void main() { } }); - test('Test Create Name Contract', () async { + test('Create name contract', () async { final name = generateRandomString(6); final contractId = await setupManager.client.contracts.createName(name: name); diff --git a/packages/tfchain_client/test/farms_test.dart b/packages/tfchain_client/test/farms_test.dart index 361d69f0..4c8e52ec 100644 --- a/packages/tfchain_client/test/farms_test.dart +++ b/packages/tfchain_client/test/farms_test.dart @@ -1,25 +1,26 @@ import 'package:test/test.dart'; import 'package:tfchain_client/generated/dev/types/tfchain_support/types/farm.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Farms Test", () { Map farmsIps = {}; - final setupManager = SetupManager(); + late SetupManager setupManager; + setUpAll(() async { - setupManager.setInitializationFlags(client: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); - test('Test Get Farm by Id', () async { + test('Get Farm by Id', () async { int? farmId = await setupManager.client.farms .create(name: generateRandomString(6), publicIps: []); Farm? farm = await setupManager.client.farms.get(id: farmId!); - expect(farm!.id, farmId); + expect(farm?.id, farmId); }); - test('Test Get Farm by invalid Id', () async { + test('Get Farm by invalid Id', () async { try { Farm? farm = await setupManager.client.farms.get(id: -2); } catch (e) { @@ -27,13 +28,13 @@ void main() { } }); - test('Test create farm', () async { + test('Create farm', () async { final farmId = await setupManager.client.farms .create(name: generateRandomString(6), publicIps: []); expect(farmId, isNotNull); }); - test('Test get farmId by name', () async { + test('Get farmId by name', () async { final name = generateRandomString(6); int? farmId = await setupManager.client.farms.create(name: name, publicIps: []); @@ -41,7 +42,7 @@ void main() { expect(res, farmId!); }); - test('Test create farm with existing name', () async { + test('Create farm with existing name', () async { try { final name = generateRandomString(6); await setupManager.client.farms.create(name: name, publicIps: []); @@ -52,7 +53,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 50))); - test('Test adding farm ip with equal ip and gateway', () async { + test('Add farm IP with equal IP and gateway', () async { try { final randomIp = generateRandomCIDRIPv4(); final gatewayIp = randomIp.split('/')[0]; @@ -65,7 +66,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 50))); - test('Test adding valid IPs to farm,', () async { + test('Add valid IPs to farm,', () async { try { final randomIp = generateRandomCIDRIPv4(); final ip = randomIp.split('/')[0]; @@ -81,7 +82,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 50))); - test('Test adding existing ips to farm', () async { + test('Add existing IPs to farm', () async { try { int? farmId1 = await setupManager.client.farms .create(name: generateRandomString(5), publicIps: []); @@ -105,7 +106,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 80))); - test('Test removing farm IP', () async { + test('removing farm IP', () async { try { final randomIp = generateRandomCIDRIPv4(); final ip = randomIp.split('/')[0]; @@ -124,7 +125,7 @@ void main() { } }, timeout: Timeout(Duration(seconds: 60))); - test('Test adding Stellar Address', () async { + test('Add Stellar Address', () async { try { final farmId = await setupManager.client.farms .create(name: generateRandomString(6), publicIps: []); diff --git a/packages/tfchain_client/test/globals.dart b/packages/tfchain_client/test/globals.dart new file mode 100644 index 00000000..476cddb2 --- /dev/null +++ b/packages/tfchain_client/test/globals.dart @@ -0,0 +1,11 @@ +library globals; + +import 'setup_manager.dart'; + +Future getSetupManager() async { + final _setupManager = new SetupManager(); + _setupManager.setInitializationFlags(queryClient: true, client: true); + await _setupManager.setup(); + + return _setupManager; +} diff --git a/packages/tfchain_client/test/pricing_policies_test.dart b/packages/tfchain_client/test/pricing_policies_test.dart index eb00aea9..983133a6 100644 --- a/packages/tfchain_client/test/pricing_policies_test.dart +++ b/packages/tfchain_client/test/pricing_policies_test.dart @@ -1,21 +1,21 @@ import 'package:test/test.dart'; import 'package:tfchain_client/generated/dev/types/pallet_tfgrid/types/pricing_policy.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Query Pricing Policies", () { - final setupManager = SetupManager(); + late SetupManager setupManager; setUpAll(() async { - setupManager.setInitializationFlags(queryClient: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); - test('Test Get Pricing Policy', () async { + test('Get Pricing Policy', () async { PricingPolicy? res = await setupManager.queryClient.policies.get(id: 1); expect(res, isNotNull); }); - test('Test Get Pricing Policy with wrong Id', () async { + test('Get Pricing Policy with wrong Id', () async { try { PricingPolicy? res = await setupManager.queryClient.policies.get(id: -10); diff --git a/packages/tfchain_client/test/tft_bridge_test.dart b/packages/tfchain_client/test/tft_bridge_test.dart index 6495a241..08fef363 100644 --- a/packages/tfchain_client/test/tft_bridge_test.dart +++ b/packages/tfchain_client/test/tft_bridge_test.dart @@ -2,26 +2,26 @@ import 'dart:math'; import 'package:test/test.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Bridge Tests", () { - final setupManager = SetupManager(); + late SetupManager setupManager; setUpAll(() async { - setupManager.setInitializationFlags(client: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); - test('Test Get Withdraw fee', () async { + test('Get Withdraw fee', () async { BigInt? fee = await setupManager.client.bridge.getWithdrawFee(); expect(fee, isNotNull); }); - test('Test Get Deposit fee', () async { + test('Get Deposit fee', () async { BigInt? fee = await setupManager.client.bridge.getDepositFee(); expect(fee, isNotNull); }); - test('Test swap to stellar zero TFTs', () async { + test('Swap to stellar zero TFTs', () async { try { await setupManager.client.bridge.swapToStellar( target: "GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG", @@ -31,7 +31,7 @@ void main() { } }); - test('Test swap to stellar', () async { + test('Swap to stellar', () async { try { var random = Random(); var randomNumber = random.nextInt(100) + 1; diff --git a/packages/tfchain_client/test/tft_price_test.dart b/packages/tfchain_client/test/tft_price_test.dart index bfe147a4..37fde133 100644 --- a/packages/tfchain_client/test/tft_price_test.dart +++ b/packages/tfchain_client/test/tft_price_test.dart @@ -1,15 +1,15 @@ import 'package:test/test.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Price Tests", () { - final setupManager = SetupManager(); + late SetupManager setupManager; setUpAll(() async { - setupManager.setInitializationFlags(queryClient: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); - test('Test Get TFT price', () async { + test('Get TFT price', () async { final price = await setupManager.queryClient.price.get(); expect(price, isNotNull); }); diff --git a/packages/tfchain_client/test/twins_test.dart b/packages/tfchain_client/test/twins_test.dart index 6c2f97e0..b132d7d4 100644 --- a/packages/tfchain_client/test/twins_test.dart +++ b/packages/tfchain_client/test/twins_test.dart @@ -1,35 +1,36 @@ import 'package:test/test.dart'; import 'package:tfchain_client/generated/dev/types/pallet_tfgrid/types/twin.dart'; +import 'globals.dart'; import 'setup_manager.dart'; void main() { group("Twins Test", () { - final setupManager = SetupManager(); + late SetupManager setupManager; + setUpAll(() async { - setupManager.setInitializationFlags(client: true); - await setupManager.setup(); + setupManager = await getSetupManager(); }); - test('Test Get Twin with id', () async { + test('Get Twin with id', () async { final twin = await setupManager.client.twins.get(id: setupManager.twinId!); expect(twin!.id, setupManager.twinId); }); - test('Test Get Twin with zero id', () async { + test('Get Twin with zero id', () async { final twin = await setupManager.client.twins.get(id: 0); expect(twin, null); }); - test('Test Get Twin Id with account Id', () async { + test('Get Twin Id with account Id', () async { String address = setupManager.myAddress; final twin = await setupManager.client.twins .getTwinIdByAccountId(address: address); expect(twin, setupManager.twinId); }); - test('Test Create Twin for existing account', () async { + test('Create Twin for existing account', () async { try { int? twin = await setupManager.client.twins.create(relay: "", pk: []); } catch (error) { @@ -39,7 +40,7 @@ void main() { ); } }); - test('Test Update Twin', () async { + test('Update Twin', () async { try { await setupManager.client.twins .update(relay: "relay.qa.grid.tf".codeUnits, pk: []);