fix tests

multiversx · Mar 15, 2024 · c089a05 · c089a05
1 parent 56ae79d
commit c089a05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
@@ -3,7 +3,8 @@ import { assert } from "chai";
 import { loadAbiRegistry, loadTestWallets, prepareDeployment, TestWallet } from "../testutils";
 import { ContractController } from "../testutils/contractController";
 import { createLocalnetProvider } from "../testutils/networkProviders";
-import { Transaction, TransactionComputer } from "../transaction";
+import { Transaction } from "../transaction";
+import { TransactionComputer } from "../transactionComputer";
 import { Interaction } from "./interaction";
 import { ReturnCode } from "./returnCode";
 import { SmartContract } from "./smartContract";

diff --git a/src/smartcontracts/smartContractResults.local.net.spec.ts b/src/smartcontracts/smartContractResults.local.net.spec.ts
@@ -9,7 +9,7 @@ import { TransactionsFactoryConfig } from "../transactionsFactories/transactions
 import { SmartContractTransactionsFactory } from "../transactionsFactories/smartContractTransactionsFactory";
 import { TokenComputer } from "../tokens";
 import { promises } from "fs";
-import { TransactionComputer } from "../transaction";
+import { TransactionComputer } from "../transactionComputer";
 
 describe("fetch transactions from local testnet", function () {
     let alice: TestWallet;

diff --git a/src/testutils/contractController.ts b/src/testutils/contractController.ts
@@ -3,7 +3,8 @@ import { Logger } from "../logger";
 import { Interaction } from "../smartcontracts/interaction";
 import { TypedOutcomeBundle, UntypedOutcomeBundle } from "../smartcontracts/interface";
 import { ResultsParser } from "../smartcontracts/resultsParser";
-import { Transaction, TransactionComputer, TransactionNext } from "../transaction";
+import { Transaction } from "../transaction";
+import { TransactionComputer } from "../transactionComputer";
 import { TransactionWatcher } from "../transactionWatcher";
 import { INetworkProvider } from "./networkProviders";
 
@@ -20,7 +21,7 @@ export class ContractController {
         });
     }
 
-    async deploy(transaction: Transaction | TransactionNext): Promise<{ transactionOnNetwork: ITransactionOnNetwork, bundle: UntypedOutcomeBundle }> {
+    async deploy(transaction: Transaction): Promise<{ transactionOnNetwork: ITransactionOnNetwork, bundle: UntypedOutcomeBundle }> {
         const txHash = this.getTransactionHash(transaction);
         Logger.info(`ContractController.deploy [begin]: transaction = ${txHash}`);
 
@@ -32,7 +33,7 @@ export class ContractController {
         return { transactionOnNetwork, bundle };
     }
 
-    async execute(interaction: Interaction, transaction: Transaction | TransactionNext): Promise<{ transactionOnNetwork: ITransactionOnNetwork, bundle: TypedOutcomeBundle }> {
+    async execute(interaction: Interaction, transaction: Transaction): Promise<{ transactionOnNetwork: ITransactionOnNetwork, bundle: TypedOutcomeBundle }> {
         const txHash = this.getTransactionHash(transaction);
         Logger.info(`ContractController.execute [begin]: function = ${interaction.getFunction()}, transaction = ${txHash}`);
 
@@ -58,11 +59,7 @@ export class ContractController {
         return bundle;
     }
 
-    private getTransactionHash(transaction: Transaction | TransactionNext): string {
-        if ("toSendable" in transaction){
-            return transaction.getHash().hex();
-        }
-
+    private getTransactionHash(transaction: Transaction): string {
         const transactionComputer = new TransactionComputer();
         const txHash = transactionComputer.computeTransactionHash(transaction);
         return Buffer.from(txHash).toString("hex");