fix multisig test to restore participant from seed and exchange keys

woodser · Aug 24, 2023 · 610049e · 610049e
1 parent 9a1961c
commit 610049e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/test/TestMoneroWalletCommon.js b/src/test/TestMoneroWalletCommon.js
@@ -4754,12 +4754,13 @@ class TestMoneroWalletCommon {
     assert(seed.length > 0);
 
     // restore participant from multisig seed
-    // TODO: fix restoring from seed: https://github.com/monero-project/monero/pull/8942
-    // participant = await this.createWallet(new MoneroWalletConfig().setSeed(seed).setIsMultisig(true));
-    // await MoneroUtils.validateAddress(await participant.getPrimaryAddress(), TestUtils.NETWORK_TYPE);
-    // assert.equal(await participant.getPrimaryAddress(), address);
-    // this._testMultisigInfo(await participant.getMultisigInfo(), M, N);
-    // assert.equal(await participant.getSeed(), seed);
+    await this.closeWallet(participant);
+    participant = await this.createWallet(new MoneroWalletConfig().setSeed(seed).setIsMultisig(true));
+    await MoneroUtils.validateAddress(await participant.getPrimaryAddress(), TestUtils.NETWORK_TYPE);
+    assert.equal(await participant.getPrimaryAddress(), address);
+    this._testMultisigInfo(await participant.getMultisigInfo(), M, N);
+    assert.equal(await participant.getSeed(), seed);
+    participants[0] = participant;
 
     // test sending a multisig transaction if configured
     if (testTx) {

diff --git a/src/test/TestMoneroWalletFull.js b/src/test/TestMoneroWalletFull.js
@@ -410,7 +410,8 @@ class TestMoneroWalletFull extends TestMoneroWalletCommon {
         catch (e) { }
 
         // save and close participants
-        await TestUtils.stopWalletRpcProcess(participants[0]);
+        if (participants[0] instanceof monerojs.MoneroWalletRpc) await TestUtils.stopWalletRpcProcess(participants[0]);
+        else participants[0].close(true); // multisig tests might restore wallet from seed
         await TestUtils.stopWalletRpcProcess(participants[1]);
         await that.closeWallet(participants[2], true);
         if (err) throw err;