feat: use proper transaction status

PolymeshAssociation · Apr 8, 2020 · d567b92 · d567b92
1 parent 25df5e0
commit d567b92
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/base/PolymeshTransaction.ts b/src/base/PolymeshTransaction.ts
@@ -215,21 +215,20 @@ export class PolymeshTransaction<Args extends unknown[], Values extends unknown[
 
         if (receipt.isCompleted) {
           /*
-           * isCompleted === isFinalized || isError, which means
+           * isCompleted === isInBlock || isError, which means
            * no further updates, so we unsubscribe
            *
-           * TODO @monitz87: change logic to use isInBlock when mesh starts using the latest substrate
            */
           gettingUnsub.then(unsub => {
             unsub();
           });
 
-          if (receipt.isFinalized) {
+          if (receipt.isInBlock) {
             // tx included in a block and finalized
             // TODO @monitz87: replace with event object when it is auto-generated by the polkadot fork
             const failed = receipt.findRecord('system', 'ExtrinsicFailed');
 
-            this.blockHash = status.asFinalized.toString();
+            this.blockHash = status.asInBlock.toString();
 
             if (failed) {
               // get revert message from event

diff --git a/src/base/__tests__/PolymeshTransaction.ts b/src/base/__tests__/PolymeshTransaction.ts
@@ -108,7 +108,7 @@ describe('Polymesh Transaction class', () => {
 
       expect(transaction.status).toBe(TransactionStatus.Running);
 
-      polkadotMockUtils.updateTxStatus(tx, polkadotMockUtils.MockTxStatus.InBlock);
+      polkadotMockUtils.updateTxStatus(tx, polkadotMockUtils.MockTxStatus.Intermediate);
 
       await delay(0);
 

diff --git a/src/testUtils/mocks/polkadot.ts b/src/testUtils/mocks/polkadot.ts
@@ -130,7 +130,7 @@ export enum MockTxStatus {
   Failed = 'Failed',
   Aborted = 'Aborted',
   Rejected = 'Rejected',
-  InBlock = 'InBlock',
+  Intermediate = 'Intermediate',
 }
 
 export enum TxFailReason {
@@ -153,16 +153,16 @@ const defaultReceipt: ISubmittableResult = {
   toHuman: () => ({}),
 };
 
-const inBlockReceipt: ISubmittableResult = merge({}, defaultReceipt, {
-  status: { isReady: false, isInBlock: false, asInBlock: 'blockHash' },
+const intermediateReceipt: ISubmittableResult = merge({}, defaultReceipt, {
+  status: { isReady: false, isInBlock: false },
   isCompleted: true,
-  isInBlock: true,
+  isInBlock: false,
 });
 
 const successReceipt: ISubmittableResult = merge({}, defaultReceipt, {
-  status: { isReady: false, isFinalized: true, asFinalized: 'blockHash' },
+  status: { isReady: false, isInBlock: true, asInBlock: 'blockHash' },
   isCompleted: true,
-  isFinalized: true,
+  isInBlock: true,
 });
 
 /**
@@ -230,8 +230,8 @@ const statusToReceipt = (status: MockTxStatus, failReason?: TxFailReason): ISubm
   if (status === MockTxStatus.Ready) {
     return defaultReceipt;
   }
-  if (status === MockTxStatus.InBlock) {
-    return inBlockReceipt;
+  if (status === MockTxStatus.Intermediate) {
+    return intermediateReceipt;
   }
 
   throw new Error(`There is no receipt associated with status ${status}`);