From 4d25414482218c3ab65410dbedb3288fe5dfd7ca Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 18 Sep 2021 21:36:23 -0700 Subject: [PATCH] Got ensureFunds() working in real transaction --- src/use-cases/offer.js | 4 ++-- test/e2e/manual/create-offer.js | 8 ++++---- test/unit/mocks/adapters/index.js | 6 +++++- test/unit/mocks/adapters/wallet.js | 3 --- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/use-cases/offer.js b/src/use-cases/offer.js index 071ef1b..482561f 100644 --- a/src/use-cases/offer.js +++ b/src/use-cases/offer.js @@ -73,10 +73,10 @@ class OfferLib { // trade. async ensureFunds (offerEntity) { try { - // console.log('this.adapters.wallet: ', this.adapters.wallet) + // console.log('this.adapters.wallet: ', this.adapters.wallet.bchWallet) // Get UTXOs. - const utxos = this.adapters.wallet.utxos.utxoStore + const utxos = this.adapters.wallet.bchWallet.utxos.utxoStore // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`) if (offerEntity.buyOrSell.includes('sell')) { diff --git a/test/e2e/manual/create-offer.js b/test/e2e/manual/create-offer.js index 44a9757..d323241 100644 --- a/test/e2e/manual/create-offer.js +++ b/test/e2e/manual/create-offer.js @@ -14,12 +14,12 @@ async function start () { lokadId: 'SWP', messageType: 1, messageClass: 1, - tokenId: 'token-id', + tokenId: + '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0', buyOrSell: 'sell', rateInSats: 1000, - minSatsToExchange: 1250, - utxoTxid: 'txid-goes-here', - utxoVout: 1 + minSatsToExchange: 10, + numTokens: 0.1 } const options = { diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js index c9b662e..3386a31 100644 --- a/test/unit/mocks/adapters/index.js +++ b/test/unit/mocks/adapters/index.js @@ -83,7 +83,11 @@ const bchjs = { // generateSignature: async () => {} // } const { MockBchWallet } = require('./wallet') -const wallet = new MockBchWallet() +const wallet = { + burnPsf: async () => {}, + generateSignature: async () => {}, + bchWallet: new MockBchWallet() +} const p2wdb = { write: async () => {} diff --git a/test/unit/mocks/adapters/wallet.js b/test/unit/mocks/adapters/wallet.js index 84f3439..a6912a0 100644 --- a/test/unit/mocks/adapters/wallet.js +++ b/test/unit/mocks/adapters/wallet.js @@ -27,9 +27,6 @@ class MockBchWallet { return { success: true, txid: 'txid' } } - this.burnPsf = async () => {} - this.generateSignature = async () => {} - // Environment variable is used by wallet-balance.unit.js to force an error. if (process.env.NO_UTXO) { this.utxos = {}