From 6f22b930dc21c0e89b420c287dede9f77e6cef60 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 10 Sep 2020 04:21:24 -0700 Subject: [PATCH 1/4] extra check in searchForDT --- src/exchange/FixedRateExchange.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts index 6365271e..c0dc083f 100644 --- a/src/exchange/FixedRateExchange.ts +++ b/src/exchange/FixedRateExchange.ts @@ -347,7 +347,7 @@ export class OceanFixedRateExchange { for (let i = 0; i < events.length; i++) { const constituents = await this.getExchange(events[i].returnValues[0]) constituents.exchangeID = events[i].returnValues[0] - if (constituents.active === true) { + if (constituents.active === true && constituents.dataToken === dataTokenAddress) { const supply = new BigNumber(this.web3.utils.fromWei(constituents.supply)) const required = new BigNumber(minSupply) if (supply >= required) { From 64d62726ffc91d8c7cc5681724b46e48be79fb64 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 10 Sep 2020 04:36:56 -0700 Subject: [PATCH 2/4] fix supply in searchforDT --- src/exchange/FixedRateExchange.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts index c0dc083f..a8e82d31 100644 --- a/src/exchange/FixedRateExchange.ts +++ b/src/exchange/FixedRateExchange.ts @@ -348,7 +348,7 @@ export class OceanFixedRateExchange { const constituents = await this.getExchange(events[i].returnValues[0]) constituents.exchangeID = events[i].returnValues[0] if (constituents.active === true && constituents.dataToken === dataTokenAddress) { - const supply = new BigNumber(this.web3.utils.fromWei(constituents.supply)) + const supply = new BigNumber(await this.getSupply(constituents.exchangeID)) const required = new BigNumber(minSupply) if (supply >= required) { result.push(constituents) From dafbb1a6ce33dccb616406d18d9b639b794c7f76 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 10 Sep 2020 06:46:01 -0700 Subject: [PATCH 3/4] add more unit tests --- src/exchange/FixedRateExchange.ts | 2 +- test/unit/exchanges/FixedPriceExchange.test.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts index a8e82d31..b7c7c969 100644 --- a/src/exchange/FixedRateExchange.ts +++ b/src/exchange/FixedRateExchange.ts @@ -350,7 +350,7 @@ export class OceanFixedRateExchange { if (constituents.active === true && constituents.dataToken === dataTokenAddress) { const supply = new BigNumber(await this.getSupply(constituents.exchangeID)) const required = new BigNumber(minSupply) - if (supply >= required) { + if (supply.gte(required)){ result.push(constituents) } } diff --git a/test/unit/exchanges/FixedPriceExchange.test.ts b/test/unit/exchanges/FixedPriceExchange.test.ts index 634e5d6a..7e6e7f30 100644 --- a/test/unit/exchanges/FixedPriceExchange.test.ts +++ b/test/unit/exchanges/FixedPriceExchange.test.ts @@ -173,6 +173,7 @@ describe('FixedRateExchange flow', () => { it('Bob should find the exchange', async () => { const exchangeDetails = await FixedRateClass.searchforDT(tokenAddress, '0') assert(exchangeDetails[0].exchangeID === aliceExchangeId) + assert(exchangeDetails.length === 1) }) it('Bob should get the exchange details', async () => { const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId) @@ -221,4 +222,8 @@ describe('FixedRateExchange flow', () => { const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId) assert(exchangeDetails.active === true) }) + it('Bob should not find the exchange', async () => { + const exchangeDetails = await FixedRateClass.searchforDT(tokenAddress, tokenAmount) + assert(exchangeDetails.length === 0) + }) }) From d6053d5dbb98e39f5e630737a6c756bc2459b5fe Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 10 Sep 2020 06:47:19 -0700 Subject: [PATCH 4/4] fix lint --- src/exchange/FixedRateExchange.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts index b7c7c969..944d88c6 100644 --- a/src/exchange/FixedRateExchange.ts +++ b/src/exchange/FixedRateExchange.ts @@ -350,7 +350,7 @@ export class OceanFixedRateExchange { if (constituents.active === true && constituents.dataToken === dataTokenAddress) { const supply = new BigNumber(await this.getSupply(constituents.exchangeID)) const required = new BigNumber(minSupply) - if (supply.gte(required)){ + if (supply.gte(required)) { result.push(constituents) } }