Merge pull request #38 from codescalers/main_change_imports

Update importing Signer pkg to be from github

Author: AlaaElattar

packages/signer/pubspec.yaml

@@ -1,6 +1,6 @@
 name: signer
 description: A signer to sign and verify raw data
-version: 1.0.0
+version: 0.1.0
 
 environment:
   sdk: ^3.2.0

packages/tfchain_client/README.md

@@ -53,30 +53,13 @@ dart run polkadart_cli:generate -v
 
 ### Prerequisites
 
-1- To run the tests, you could run it against a local docker image of the TFChain
+1- To run the tests against a local docker image of the TFChain:
 
 ```bash
 docker run --network host ghcr.io/threefoldtech/tfchain:2.8.1 --dev --rpc-cors all --rpc-external --rpc-methods=safe
 ```
 
-2- Provide your mnemonic as environment variable.
-
-```bash
-export MNEMONIC="your-mnemonic"
-```
-
-2- provide chain url and the signing type.
-By default the chain url is set to `wss://tfchain.dev.grid.tf/ws` and the signing type is `sr25519`. Note that signing type can be either `sr25519` or `ed25519`.
-
-```bash
-export URL="chain_url"
-```
-
-```bash
-export KEYPAIR_TYPE="sr25519"
-```
-
-To run the tests, run the following command
+2- Then run:
 
 ```bash
 dart test

packages/tfchain_client/lib/tfchain_client.dart

@@ -14,6 +14,7 @@ import 'package:polkadart/polkadart.dart'
         StateApi;
 import 'package:polkadart/scale_codec.dart';
 import 'package:polkadart_keyring/polkadart_keyring.dart';
+import 'package:signer/signer.dart' as Signer;
 import 'package:tfchain_client/generated/dev/types/tfchain_runtime/runtime_call.dart';
 import 'package:tfchain_client/src/error_mapper.dart';
 import 'package:tfchain_client/src/balances.dart' as balance;
@@ -29,7 +30,6 @@ import 'package:tfchain_client/src/tft_bridge.dart';
 import 'package:tfchain_client/src/tft_price.dart';
 import 'package:tfchain_client/src/twins.dart';
 import 'package:bip39/bip39.dart';
-import 'package:signer/signer.dart' as Signer;
 import 'package:collection/collection.dart';
 import 'package:tfchain_client/src/utils.dart';
 

packages/tfchain_client/pubspec.lock

@@ -516,9 +516,11 @@ packages:
   signer:
     dependency: "direct main"
     description:
-      path: "../signer"
-      relative: true
-    source: path
+      path: "packages/signer"
+      ref: main
+      resolved-ref: "3663a356a722c082aa0b68d5405f42b3885beedb"
+      url: "https://github.com/codescalers/tfgrid-sdk-dart.git"
+    source: git
     version: "1.0.0"
   source_map_stack_trace:
     dependency: transitive

packages/tfchain_client/pubspec.yaml

@@ -1,6 +1,6 @@
 name: tfchain_client
 description: A sample command-line application.
-version: 1.0.0
+version: 0.1.0
 
 environment:
   sdk: ^3.2.0
@@ -14,7 +14,10 @@ dependencies:
   bip39: ^1.0.6
   moment_dart: ^2.0.2
   signer: 
-    path: ../signer
+    git:
+      url: https://github.com/codescalers/tfgrid-sdk-dart.git
+      ref: main
+      path: packages/signer
   hashlib: ^1.13.1
   substrate_metadata: ^1.2.0
 

packages/tfchain_client/test/contracts_test.dart

@@ -1,4 +1,3 @@
-@Timeout(Duration(seconds: 50))
 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';

packages/tfchain_client/test/farms_test.dart

@@ -1,4 +1,3 @@
-@Timeout(Duration(seconds: 70))
 import 'package:test/test.dart';
 import 'package:tfchain_client/generated/dev/types/tfchain_support/types/farm.dart';
 
@@ -51,7 +50,7 @@ void main() {
       } catch (error) {
         expect(error, isNotNull);
       }
-    }, timeout: Timeout(Duration(seconds: 70)));
+    }, timeout: Timeout(Duration(seconds: 50)));
 
     test('Test adding farm ip with equal ip and gateway', () async {
       try {
@@ -104,7 +103,7 @@ void main() {
         // will fail as the ip already exists
         expect(error, isNotNull);
       }
-    }, timeout: Timeout(Duration(seconds: 100)));
+    }, timeout: Timeout(Duration(seconds: 80)));
 
     test('Test removing farm IP', () async {
       try {
@@ -123,7 +122,7 @@ void main() {
       } catch (error) {
         expect(error, isNull);
       }
-    }, timeout: Timeout(Duration(seconds: 100)));
+    }, timeout: Timeout(Duration(seconds: 60)));
 
     test('Test adding Stellar Address', () async {
       try {
@@ -136,7 +135,7 @@ void main() {
       } catch (error) {
         expect(error, isNull);
       }
-    }, timeout: Timeout(Duration(seconds: 50)));
+    }, timeout: Timeout(Duration(seconds: 70)));
 
     tearDown(() async {
       if (farmsIps.isNotEmpty) {

pubspec.lock

@@ -629,8 +629,10 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/signer"
-      relative: true
-    source: path
+      ref: main
+      resolved-ref: "3663a356a722c082aa0b68d5405f42b3885beedb"
+      url: "https://github.com/codescalers/tfgrid-sdk-dart.git"
+    source: git
     version: "1.0.0"
   source_map_stack_trace:
     dependency: transitive
@@ -759,14 +761,14 @@ packages:
       sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   tfchain_client:
     dependency: "direct main"
     description:
       path: "packages/tfchain_client"
       relative: true
     source: path
-    version: "1.0.0"
+    version: "0.1.0"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -13,7 +13,10 @@ dependencies:
   coverage: ^1.7.1
   melos: ^4.1.0
   signer: 
-    path: ./packages/signer
+    git:
+      url: https://github.com/codescalers/tfgrid-sdk-dart.git
+      ref: main
+      path: packages/signer
   substrate_bip39: ^0.4.0
   tfchain_client:
     path: ./packages/tfchain_client