Fix tests

multiversx · Jan 30, 2025 · ff2520e · ff2520e
1 parent 94d246c
commit ff2520e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/src/abi/smartContract.spec.ts b/src/abi/smartContract.spec.ts
@@ -94,9 +94,7 @@ describe("test contract", () => {
             address: new Address("erd1qqqqqqqqqqqqqpgqak8zt22wl2ph4tswtyc39namqx6ysa2sd8ss4xmlj3"),
         });
 
-        provider.mockUpdateAccount(alice.address, (account) => {
-            account.nonce = 42n;
-        });
+        alice.nonce = 42n;
 
         let callTransactionOne = contract.call({
             func: new ContractFunction("helloEarth"),
@@ -169,10 +167,7 @@ describe("test contract", () => {
             caller: alice.address,
         });
 
-        provider.mockUpdateAccount(alice.address, (account) => {
-            account.nonce = 42n;
-        });
-
+        alice.nonce = 42n;
         deployTransaction.nonce = alice.nonce;
 
         assert.equal(deployTransaction.data.toString(), "upgradeContract@01020304@0100");

diff --git a/src/accounts/account.spec.ts b/src/accounts/account.spec.ts
@@ -19,7 +19,7 @@ describe("test account methods", function () {
     });
 
     it("should create account from keystore", async function () {
-        const account = Account.newFromKeystore(`${testWallets}/withDummyMnemonic.json`, "password");
+        const account = Account.newFromKeystore(`${getTestWalletsPath()}/withDummyMnemonic.json`, "password");
 
         assert.equal(
             account.secretKey.valueOf().toString("hex"),

diff --git a/src/core/transaction.spec.ts b/src/core/transaction.spec.ts
@@ -123,8 +123,8 @@ describe("test transaction", async () => {
     it("should sign transaction (with usernames)", async () => {
         const transaction = new Transaction({
             chainID: "T",
-            sender: alice.address,
-            receiver: bob.address,
+            sender: carol.address,
+            receiver: alice.address,
             gasLimit: 50000n,
             value: 1000000000000000000n,
             version: 2,
@@ -133,7 +133,7 @@ describe("test transaction", async () => {
             receiverUsername: "alice",
         });
 
-        transaction.signature = alice.signTransaction(transaction);
+        transaction.signature = carol.signTransaction(transaction);
 
         assert.equal(
             Buffer.from(transaction.signature).toString("hex"),
@@ -343,7 +343,7 @@ describe("test transaction", async () => {
             chainID: "T",
         });
 
-        transaction.signature = alice.signTransaction(transaction);
+        transaction.signature = carol.signTransaction(transaction);
 
         assert.equal(
             Buffer.from(transaction.signature).toString("hex"),
@@ -608,7 +608,7 @@ describe("test transaction", async () => {
             options: 1,
         });
 
-        transaction.signature = alice.signTransaction(transaction);
+        transaction.signature = await alice.sign(transactionComputer.computeHashForSigning(transaction));
 
         assert.equal(
             Buffer.from(transaction.signature).toString("hex"),
@@ -719,9 +719,9 @@ describe("test transaction", async () => {
 
         transactionComputer.applyOptionsForHashSigning(transaction);
 
-        transaction.signature = alice.signTransaction(transaction);
+        transaction.signature = await alice.sign(transactionComputer.computeHashForSigning(transaction));
 
-        const userVerifier = new UserVerifier(new UserPublicKey(alice.address.getPublicKey()));
+        const userVerifier = new UserVerifier(alice.publicKey);
         const isSignedByAlice = userVerifier.verify(
             transactionComputer.computeBytesForVerifying(transaction),
             transaction.signature,
@@ -732,7 +732,6 @@ describe("test transaction", async () => {
             transactionComputer.computeBytesForVerifying(transaction),
             transaction.signature,
         );
-
         assert.equal(isSignedByAlice, true);
         assert.equal(isSignedByBob, false);
     });

diff --git a/src/wallet/userKeys.ts b/src/wallet/userKeys.ts
@@ -45,7 +45,7 @@ export class UserSecretKey {
         return new UserSecretKey(secretKey);
     }
 
-    sign(message: Buffer | Uint8Array): Uint8Array {
+    sign(message: Uint8Array): Uint8Array {
         const signature = ed.sync.sign(new Uint8Array(message), new Uint8Array(this.buffer));
         return signature;
     }