From ffb6a12dec4c27f9b570fcc2016fb3c17f5dcfb4 Mon Sep 17 00:00:00 2001
From: Antun Badurina <antun.badurina@gmail.com>
Date: Fri, 8 Jul 2022 14:19:58 +0200
Subject: [PATCH] fix: contract tests

---
 __tests__/contract.test.ts      | 31 +++++++++++--------------------
 src/contract/contractFactory.ts |  9 +++------
 src/provider/default.ts         |  2 +-
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/__tests__/contract.test.ts b/__tests__/contract.test.ts
index de66bde78..29c137b1a 100644
--- a/__tests__/contract.test.ts
+++ b/__tests__/contract.test.ts
@@ -22,26 +22,20 @@ describe('class Contract {}', () => {
     let contract: Contract;
 
     beforeAll(async () => {
-      const { code, transaction_hash, address } = await provider.deployContract({
+      const { transaction_hash, contract_address } = await provider.deployContract({
         contract: compiledErc20,
       });
-      erc20 = new Contract(compiledErc20.abi, address!, provider);
-      expect(code).toBe('TRANSACTION_RECEIVED');
+      erc20 = new Contract(compiledErc20.abi, contract_address!, provider);
       await provider.waitForTransaction(transaction_hash);
       // Deploy Multicall
 
-      const {
-        code: m_code,
-        transaction_hash: m_transaction_hash,
-        address: multicallAddress,
-      } = await provider.deployContract({
-        contract: compiledMulticall,
-      });
+      const { transaction_hash: m_transaction_hash, contract_address: multicallAddress } =
+        await provider.deployContract({
+          contract: compiledMulticall,
+        });
 
       contract = new Contract(compiledMulticall.abi, multicallAddress!, provider);
 
-      expect(m_code).toBe('TRANSACTION_RECEIVED');
-
       await provider.waitForTransaction(m_transaction_hash);
     });
 
@@ -92,11 +86,10 @@ describe('class Contract {}', () => {
     let contract: Contract;
 
     beforeAll(async () => {
-      const { code, transaction_hash, address } = await provider.deployContract({
+      const { transaction_hash, contract_address } = await provider.deployContract({
         contract: compiledTypeTransformation,
       });
-      contract = new Contract(compiledTypeTransformation.abi, address!, provider);
-      expect(code).toBe('TRANSACTION_RECEIVED');
+      contract = new Contract(compiledTypeTransformation.abi, contract_address!, provider);
       await provider.waitForTransaction(transaction_hash);
     });
 
@@ -205,9 +198,8 @@ describe('class Contract {}', () => {
       const erc20Response = await provider.deployContract({
         contract: compiledErc20,
       });
-      erc20Address = erc20Response.address!;
+      erc20Address = erc20Response.contract_address!;
       erc20 = new Contract(compiledErc20.abi, erc20Address, provider);
-      expect(erc20Response.code).toBe('TRANSACTION_RECEIVED');
       await provider.waitForTransaction(erc20Response.transaction_hash);
     });
 
@@ -229,12 +221,11 @@ describe('class Contract {}', () => {
 describe('class ContractFactory {}', () => {
   let erc20Address: string;
   beforeAll(async () => {
-    const { code, transaction_hash, address } = await provider.deployContract({
+    const { transaction_hash, contract_address } = await provider.deployContract({
       contract: compiledErc20,
     });
-    expect(code).toBe('TRANSACTION_RECEIVED');
     await provider.waitForTransaction(transaction_hash);
-    erc20Address = address!;
+    erc20Address = contract_address!;
   });
   test('deployment of new contract', async () => {
     const factory = new ContractFactory(compiledErc20, provider);
diff --git a/src/contract/contractFactory.ts b/src/contract/contractFactory.ts
index 984063473..6c145b470 100644
--- a/src/contract/contractFactory.ts
+++ b/src/contract/contractFactory.ts
@@ -34,19 +34,16 @@ export class ContractFactory {
     constructorCalldata?: RawCalldata,
     addressSalt?: BigNumberish
   ): Promise<Contract> {
-    const { address, code, transaction_hash } = await this.providerOrAccount.deployContract({
+    const { contract_address, transaction_hash } = await this.providerOrAccount.deployContract({
       contract: this.compiledContract,
       constructorCalldata,
       addressSalt,
     });
-    assert(
-      code === 'TRANSACTION_RECEIVED' && Boolean(address),
-      'Deployment of the contract failed'
-    );
+    assert(Boolean(contract_address), 'Deployment of the contract failed');
 
     const contractInstance = new Contract(
       this.compiledContract.abi,
-      address!,
+      contract_address!,
       this.providerOrAccount
     );
     contractInstance.deployTransactionHash = transaction_hash;
diff --git a/src/provider/default.ts b/src/provider/default.ts
index 3435c0d81..9ccd30817 100644
--- a/src/provider/default.ts
+++ b/src/provider/default.ts
@@ -100,7 +100,7 @@ export class Provider implements ProviderInterface {
     return this.provider.declareContract(payload);
   }
 
-  public async waitForTransaction(txHash: BigNumberish, retryInterval: number): Promise<void> {
+  public async waitForTransaction(txHash: BigNumberish, retryInterval?: number): Promise<void> {
     return this.provider.waitForTransaction(txHash, retryInterval);
   }
 }