Skip to content

Add a global setup manager instance #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/tfchain_client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 8 additions & 10 deletions packages/tfchain_client/test/balances_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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");
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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);
});
Expand Down
6 changes: 3 additions & 3 deletions packages/tfchain_client/test/client_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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', () {
Expand Down
18 changes: 9 additions & 9 deletions packages/tfchain_client/test/contracts_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<BigInt> 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));
Expand All @@ -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);
Expand All @@ -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<int> contracts =
await setupManager.client.contracts.getActiveContracts(nodeId: -21);
Expand All @@ -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 =
Expand All @@ -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),
Expand All @@ -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);
Expand Down
29 changes: 15 additions & 14 deletions packages/tfchain_client/test/farms_test.dart
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
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<int, String> 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) {
expect(e, isNotNull);
}
});

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: []);
final res = await setupManager.client.farms.getFarmIdByName(name: name);
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: []);
Expand All @@ -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];
Expand All @@ -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];
Expand All @@ -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: []);
Expand All @@ -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];
Expand All @@ -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: []);
Expand Down
11 changes: 11 additions & 0 deletions packages/tfchain_client/test/globals.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
library globals;

import 'setup_manager.dart';

Future<SetupManager> getSetupManager() async {
final _setupManager = new SetupManager();
_setupManager.setInitializationFlags(queryClient: true, client: true);
await _setupManager.setup();

return _setupManager;
}
10 changes: 5 additions & 5 deletions packages/tfchain_client/test/pricing_policies_test.dart
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
14 changes: 7 additions & 7 deletions packages/tfchain_client/test/tft_bridge_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions packages/tfchain_client/test/tft_price_test.dart
Original file line number Diff line number Diff line change
@@ -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);
});
Expand Down
Loading
Loading