refactor: faucet status to is in block

package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@godaddy/terminus": "^4.1.0",
-    "@kiltprotocol/sdk-js": "^0.19.1-be43462.0",
+    "@kiltprotocol/sdk-js": "^0.19.1-d0076cb.0",
     "@nestjs/common": "^5.4.0",
     "@nestjs/core": "^5.4.0",
     "@nestjs/mongoose": "^5.2.2",

src/faucet/faucet.controller.ts

@@ -21,6 +21,7 @@ import {
   FaucetDropInvalidAddressException,
 } from './exceptions'
 import { AuthGuard } from '../auth/auth.guard'
+import { IS_IN_BLOCK } from '@kiltprotocol/sdk-js/build/blockchain/Blockchain'
 
 const DEFAULT_TOKEN_AMOUNT = 500
 
@@ -75,8 +76,10 @@ export class FaucetController {
         new BN(DEFAULT_TOKEN_AMOUNT),
         0
       )
-      const status = await Blockchain.submitSignedTx(tx)
-      return Promise.resolve(status.isFinalized)
+      const status = await Blockchain.submitSignedTx(tx, {
+        resolveOn: IS_IN_BLOCK,
+      })
+      return Promise.resolve(status.isInBlock)
     } catch (e) {
       console.error(e)
       return Promise.resolve(false)

src/faucet/faucet.module.spec.ts

@@ -39,7 +39,7 @@ jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain', () => {
     default: {
       submitSignedTx: jest.fn(
         async (): Promise<SubmittableResult> => {
-          return { isFinalized: true } as SubmittableResult
+          return { isInBlock: true } as SubmittableResult
         }
       ),
     },
@@ -137,7 +137,7 @@ describe('Faucet Module', () => {
           .spyOn(Identity, 'buildFromSeed')
           .mockResolvedValue(faucetIdentity)
         mockedsubmitSignedTx.mockResolvedValue({
-          isFinalized: false,
+          isInBlock: false,
         } as SubmittableResult)
         const updateSpy = jest.spyOn(
           fakeFaucetService,
@@ -203,7 +203,7 @@ describe('Faucet Module', () => {
           .spyOn(Identity, 'buildFromSeed')
           .mockResolvedValue(faucetIdentity)
           mockedsubmitSignedTx.mockResolvedValue({
-            isFinalized: true,
+            isInBlock: true,
           } as SubmittableResult)
         expect(
           await faucetController['transferTokens'](claimerAddress)
@@ -249,7 +249,7 @@ describe('Faucet Module', () => {
           0
         )
         mockedsubmitSignedTx.mockResolvedValue({
-          isFinalized: false,
+          isInBlock: false,
         } as SubmittableResult)
         expect(
           await faucetController['transferTokens'](claimerAddress)

test/faucet.e2e-spec.ts

@@ -17,7 +17,7 @@ jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain', () => {
   return {
     __esModules: true,
     default: {
-      submitSignedTx: jest.fn(() => Promise.resolve({ isFinalized: true })),
+      submitSignedTx: jest.fn(() => Promise.resolve({ isInBlock: true })),
     }
   }
 })
@@ -47,7 +47,7 @@ describe('faucet endpoint (e2e)', () => {
   beforeEach(async () => {
     await faucetService.reset()
     require('@kiltprotocol/sdk-js/build/blockchain/Blockchain').default.submitSignedTx.mockResolvedValue(
-      { isFinalized: true }
+      { isInBlock: true }
     )
     require('@kiltprotocol/sdk-js/build/balance/Balance.chain').makeTransfer.mockResolvedValue(
       { }