fix: do not wait for refresh to finish on wallet create

synonymdev · Nov 19, 2024 · 940e4bc · 940e4bc
1 parent 8491108
commit 940e4bc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beignet",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "A self-custodial, JS Bitcoin wallet management library.",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/wallet/index.ts b/src/wallet/index.ts
@@ -273,8 +273,7 @@ export class Wallet {
 			const res = await wallet.setWalletData();
 			if (res.isErr()) return err(res.error.message);
 			wallet.updateFeeEstimates(true);
-			console.log('Syncing Wallet...');
-			await wallet.refreshWallet({});
+			wallet.refreshWallet({});
 			if (wallet._disableMessagesOnCreate) wallet.disableMessages = false;
 			return ok(wallet);
 		} catch (e) {

diff --git a/tests/boost.test.ts b/tests/boost.test.ts
@@ -76,6 +76,7 @@ beforeEach(async function () {
 		throw res.error;
 	}
 	wallet = res.value;
+	await wallet.refreshWallet({});
 });
 
 describe('Boost', async function () {

diff --git a/tests/electrum.test.ts b/tests/electrum.test.ts
@@ -13,7 +13,7 @@ const expect = chai.expect;
 
 const testTimeout = 60000;
 
-let wallet;
+let wallet: Wallet;
 
 before(async function () {
 	this.timeout(testTimeout);
@@ -33,13 +33,15 @@ before(async function () {
 		return;
 	}
 	wallet = res.value;
+	await wallet.refreshWallet({});
 });
 
 describe('Electrum Methods', async function (): Promise<void> {
 	this.timeout(testTimeout);
 	it('connectToElectrum: Should connect to a random Electrum server', async () => {
 		const connectResponse = await wallet.connectToElectrum();
 		expect(connectResponse.isErr()).to.equal(false);
+		if (connectResponse.isErr()) return;
 		expect(connectResponse.value).to.equal('Connected to Electrum server.');
 	});
 

diff --git a/tests/storage.test.ts b/tests/storage.test.ts
@@ -19,7 +19,7 @@ const expect = chai.expect;
 
 const testTimeout = 60000;
 
-let wallet;
+let wallet: Wallet;
 const WALLET_NAME = 'storagetestwallet0';
 
 before(async function () {

diff --git a/tests/transaction.test.ts b/tests/transaction.test.ts
@@ -17,7 +17,7 @@ const expect = chai.expect;
 
 const testTimeout = 60000;
 
-let wallet;
+let wallet: Wallet;
 
 before(async function () {
 	this.timeout(testTimeout);
@@ -35,6 +35,7 @@ before(async function () {
 		return;
 	}
 	wallet = res.value;
+	await wallet.refreshWallet({});
 });
 
 describe('Transaction Test', async function (): Promise<void> {
@@ -158,7 +159,11 @@ describe('Transaction Test', async function (): Promise<void> {
 		await wallet.transaction.resetSendTransaction();
 		const setupResponse = await wallet.transaction.setupTransaction({
 			outputs: [
-				{ address: 'tb1qaq7jszepjuntxx494xhwrxs746v94583ls02ke', value: 5000 }
+				{
+					index: 0,
+					address: 'tb1qaq7jszepjuntxx494xhwrxs746v94583ls02ke',
+					value: 5000
+				}
 			]
 		});
 		expect(setupResponse.isErr()).to.equal(false);

diff --git a/tests/wallet.test.ts b/tests/wallet.test.ts
@@ -52,6 +52,7 @@ before(async function () {
 		return;
 	}
 	wallet = res.value;
+	await wallet.refreshWallet({});
 });
 
 describe('Wallet Library', async function () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ before(async function () { @@
     		return;
     	}
     	wallet = res.value;
+    	await wallet.refreshWallet({});
     });
     describe('Wallet Library', async function () {
@@ Expand Down @@