fix: make transfers

gear-foundation · Oct 5, 2023 · ca021e4 · ca021e4
1 parent b85bf43
commit ca021e4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 29 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -43,9 +43,6 @@ jobs:
       - name: Run Gear node
         run: nohup ./gear --chain ./dev.json --validator --alice --tmp --pruning archive --unsafe-ws-external --unsafe-rpc-external --rpc-methods Unsafe --rpc-cors all &
 
-      - name: Sleep
-        run: sleep 10
-
       - name: Make transfers
         run: node ./test/make-transfers.js
 

diff --git a/test/make-transfers.js b/test/make-transfers.js
@@ -7,35 +7,29 @@ const main = async () => {
   const alice = keyring.addFromUri('//Alice', {}, 'sr25519');
   const bob = keyring.addFromUri('//Bob', {}, 'sr25519');
 
-  await api.tx.balances
-    .transferKeepAlive('5HChDnRNd2xn7rGsbJNqJrV5NmpALVKTY9YC2Zzeyu5rjzqC', 1000 * 10 ** 12)
-    .signAndSend(alice, ({ events }) => {
-      const transferEvent = events.find(
-        ({ event: { method, section } }) => section === 'system' && method === 'Transfer',
-      );
+  const tx = api.tx.utility.batchAll([
+    api.tx.balances.transferKeepAlive('5HChDnRNd2xn7rGsbJNqJrV5NmpALVKTY9YC2Zzeyu5rjzqC', 1000 * 10 ** 12),
+    api.tx.balances.transferKeepAlive('5GDCKqWHVg6NG9RQeKQjAQ7t9Pc94UZ3FsxRDCNyesUudi8Y', 100 * 10 ** 12),
+  ]);
 
-      if (transferEvent) {
-        const [from, to, amount] = transferEvent.event.data;
-        console.log(`${from} transfered ${amount} to ${to}`);
-      } else {
-        console.log('No transfer event found');
-      }
-    });
-
-  await api.tx.balances
-    .transferKeepAlive('5GDCKqWHVg6NG9RQeKQjAQ7t9Pc94UZ3FsxRDCNyesUudi8Y', 100 * 10 ** 12)
-    .signAndSend(bob, ({ events }) => {
-      const transferEvent = events.find(
-        ({ event: { method, section } }) => section === 'system' && method === 'Transfer',
-      );
+  await new Promise((resolve, reject) =>
+    tx.signAndSend(alice, ({ events, status }) => {
+      if (status.isInBlock) {
+        const transferEvent = events.find(
+          ({ event: { method, section } }) => section === 'system' && method === 'Transfer',
+        );
 
-      if (transferEvent) {
-        const [from, to, amount] = transferEvent.event.data;
-        console.log(`${from} transfered ${amount} to ${to}`);
-      } else {
-        console.log('No transfer event found');
+        if (transferEvent) {
+          const [from, to, amount] = transferEvent.event.data;
+          console.log(`${from} transfered ${amount} to ${to}`);
+        } else {
+          console.log('No transfer event found');
+        }
+      } else if (status.isFinalized) {
+        resolve('Finalized');
       }
-    });
+    }),
+  );
 };
 
 main()