oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

exchange.create returns TransactionReceipt

Browse Source
This commit is contained in:
alexcos20 2020-10-21 03:38:03 -07:00
parent 11271a970b
commit 93f0d53c5a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/exchange/FixedRateExchange.ts
View File

@ -73,14 +73,14 @@ export class OceanFixedRateExchange {
* @param {Number} rate exchange rate * @param {Number} rate exchange rate
* @param {String} address User address * @param {String} address User address
* @param {String} amount Optional, amount of datatokens to be approved for the exchange * @param {String} amount Optional, amount of datatokens to be approved for the exchange
* @return {Promise<string>} exchangeId * @return {Promise<TransactionReceipt>} TransactionReceipt
*/ */
public create( public create(
dataToken: string, dataToken: string,
rate: string, rate: string,
address: string, address: string,
amount?: string amount?: string
): SubscribablePromise<FixedRateCreateProgressStep, string> { ): SubscribablePromise<FixedRateCreateProgressStep, TransactionReceipt> {
return new SubscribablePromise(async (observer) => { return new SubscribablePromise(async (observer) => {
observer.next(FixedRateCreateProgressStep.CreatingExchange) observer.next(FixedRateCreateProgressStep.CreatingExchange)
let estGas let estGas
@ -116,7 +116,7 @@ export class OceanFixedRateExchange {
observer.next(FixedRateCreateProgressStep.ApprovingDatatoken) observer.next(FixedRateCreateProgressStep.ApprovingDatatoken)
this.datatokens.approve(dataToken, this.fixedRateExchangeAddress, amount, address) this.datatokens.approve(dataToken, this.fixedRateExchangeAddress, amount, address)
} }
return exchangeId return trxReceipt
}) })
} }

3
test/unit/exchanges/FixedPriceExchange.test.ts
View File

@ -168,7 +168,8 @@ describe('FixedRateExchange flow', () => {
if (consoleDebug) console.log('Bob ocean allowance:' + balance) if (consoleDebug) console.log('Bob ocean allowance:' + balance)
}) })
it('Alice creates a new FixedRate Exchange with a rate of 0.5', async () => { it('Alice creates a new FixedRate Exchange with a rate of 0.5', async () => {
aliceExchangeId = await FixedRateClass.create(tokenAddress, fixedPriceRate, alice) const trxReceipt = await FixedRateClass.create(tokenAddress, fixedPriceRate, alice)
aliceExchangeId = trxReceipt.events.ExchangeCreated.returnValues[0]
if (consoleDebug) console.log('aliceExchangeId:' + aliceExchangeId) if (consoleDebug) console.log('aliceExchangeId:' + aliceExchangeId)
}) })
it('Bob should find the exchange', async () => { it('Bob should find the exchange', async () => {