From 8857242570cf3a118ccc673384ee15b74b3190ed Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Tue, 14 Dec 2021 17:04:55 -0800 Subject: [PATCH] fix(bch/getStats()): Adding names to service provider IDs --- .gitignore | 1 + src/adapters/bch/index.js | 42 +++++++++++++++++++++++++------ test/e2e/manual/bch-e2e.js | 2 +- test/unit/mocks/adapters/index.js | 8 +++++- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e66b587..4445059 100644 --- a/.gitignore +++ b/.gitignore @@ -66,5 +66,6 @@ system-user-*.json orbitdb ipfsdata .ipfsdata +run-dev.sh !README.md diff --git a/src/adapters/bch/index.js b/src/adapters/bch/index.js index 521dcca..ef28111 100644 --- a/src/adapters/bch/index.js +++ b/src/adapters/bch/index.js @@ -60,16 +60,44 @@ class BchAdapter { async getStatus () { try { - console.log( - 'this.ipfs.ipfsCoordAdapter.state: ', - this.ipfs.ipfsCoordAdapter.state - ) + const peerData = this.ipfs.ipfsCoordAdapter.ipfsCoord.thisNode.peerData + // console.log(`peerData: ${JSON.stringify(peerData, null, 2)}`) - const status = { - state: this.ipfs.ipfsCoordAdapter.state + // const status = { + // state: this.ipfs.ipfsCoordAdapter.state + // } + + // Add names to the IPFS IDs for each provider. + const initialServiceProviders = + this.ipfs.ipfsCoordAdapter.state.serviceProviders + const serviceProviders = [] + for (let i = 0; i < initialServiceProviders.length; i++) { + const thisProvider = initialServiceProviders[i] + + const providerData = peerData.filter((x) => x.from === thisProvider) + + if (providerData.length) { + const provObj = { + ipfsId: thisProvider, + name: providerData[0].data.jsonLd.name + } + + serviceProviders.push(provObj) + } } - return status + // console.log( + // `serviceProviders: ${JSON.stringify(serviceProviders, null, 2)}` + // ) + + const outObj = { + serviceProviders, + selectedProvider: + this.ipfs.ipfsCoordAdapter.state.selectedServiceProvider + } + // console.log('outObj: ', outObj) + + return outObj } catch (err) { // console.log('createUser() error: ', err) wlogger.error('Error in use-cases/bch.js/getStatus()') diff --git a/test/e2e/manual/bch-e2e.js b/test/e2e/manual/bch-e2e.js index 1982756..507ee79 100644 --- a/test/e2e/manual/bch-e2e.js +++ b/test/e2e/manual/bch-e2e.js @@ -65,7 +65,7 @@ describe('#BCH E2E Tests', () => { describe('#broadcast', () => { it('should attempt to broadcast a transaction', async () => { const body = { - hex: "'01000000013ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000006a4730440220540986d1c58d6e76f8f05501c520c38ce55393d0ed7ed3c3a82c69af04221232022058ea43ed6c05fec0eccce749a63332ed4525460105346f11108b9c26df93cd72012103083dfc5a0254613941ddc91af39ff90cd711cdcde03a87b144b883b524660c39ffffffff01807c814a000000001976a914d7e7c4e0b70eaa67ceff9d2823d1bbb9f6df9a5188ac00000000'" + hex: '01000000013ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000006a4730440220540986d1c58d6e76f8f05501c520c38ce55393d0ed7ed3c3a82c69af04221232022058ea43ed6c05fec0eccce749a63332ed4525460105346f11108b9c26df93cd72012103083dfc5a0254613941ddc91af39ff90cd711cdcde03a87b144b883b524660c39ffffffff01807c814a000000001976a914d7e7c4e0b70eaa67ceff9d2823d1bbb9f6df9a5188ac00000000' } const url = `${SERVER}/bch/broadcast` diff --git a/test/unit/mocks/adapters/index.js b/test/unit/mocks/adapters/index.js index a5096e9..13ad0e0 100644 --- a/test/unit/mocks/adapters/index.js +++ b/test/unit/mocks/adapters/index.js @@ -12,9 +12,15 @@ const ipfs = { peer: { sendPrivateMessage: () => {} } + }, + thisNode: { + peerData: [] } }, - peerInputHandler: () => {} + peerInputHandler: () => {}, + state: { + serviceProviders: [] + } } }