diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts index d5dd1c05..648aa8a9 100644 --- a/src/datatokens/Datatokens.ts +++ b/src/datatokens/Datatokens.ts @@ -3,7 +3,7 @@ import { AbiItem } from 'web3-utils/types' import defaultFactoryABI from '@oceanprotocol/contracts/artifacts/DTFactory.json' import defaultDatatokensABI from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json' - +import { Logger } from '../utils' import wordListDefault from '../data/words.json' import { TransactionReceipt } from 'web3-core' import BigNumber from 'bignumber.js' @@ -16,7 +16,7 @@ export class DataTokens { public factoryABI: AbiItem | AbiItem[] public datatokensABI: AbiItem | AbiItem[] public web3: Web3 - + private logger: Logger /** * Instantiate DataTokens (independently of Ocean). * @param {String} factoryAddress @@ -28,12 +28,14 @@ export class DataTokens { factoryAddress: string, factoryABI: AbiItem | AbiItem[], datatokensABI: AbiItem | AbiItem[], - web3: Web3 + web3: Web3, + logger: Logger ) { this.factoryAddress = factoryAddress this.factoryABI = factoryABI || (defaultFactoryABI.abi as AbiItem[]) this.datatokensABI = datatokensABI || (defaultDatatokensABI.abi as AbiItem[]) this.web3 = web3 + this.logger = logger } /** @@ -108,7 +110,7 @@ export class DataTokens { try { tokenAddress = trxReceipt.events.TokenCreated.returnValues[0] } catch (e) { - console.error(`ERROR: Failed to create datatoken : ${e.message}`) + this.logger.error(`ERROR: Failed to create datatoken : ${e.message}`) } return tokenAddress } @@ -373,7 +375,7 @@ export class DataTokens { .send({ from: address, gas: 600000 }) return trxReceipt } catch (e) { - console.error(`ERROR: Failed to start order : ${e.message}`) + this.logger.error(`ERROR: Failed to start order : ${e.message}`) return null } } diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts index 56176bc2..05afb676 100644 --- a/src/ocean/Ocean.ts +++ b/src/ocean/Ocean.ts @@ -50,7 +50,8 @@ export class Ocean extends Instantiable { instanceConfig.config.factoryAddress, instanceConfig.config.factoryABI, instanceConfig.config.datatokensABI, - instanceConfig.config.web3Provider + instanceConfig.config.web3Provider, + instanceConfig.logger ) instance.pool = new OceanPool( instanceConfig.config.web3Provider, diff --git a/test/unit/Datatokens.test.ts b/test/unit/Datatokens.test.ts index f760f04c..a4de8765 100644 --- a/test/unit/Datatokens.test.ts +++ b/test/unit/Datatokens.test.ts @@ -2,7 +2,7 @@ import { assert } from 'chai' import { AbiItem } from 'web3-utils/types' import { TestContractHandler } from '../TestContractHandler' import { DataTokens } from '../../src/datatokens/Datatokens' - +import { LoggerInstance } from '../../src/utils' import Web3 from 'web3' import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json' import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json' @@ -38,7 +38,8 @@ describe('DataTokens', () => { contracts.factoryAddress, factory.abi as AbiItem[], datatokensTemplate.abi as AbiItem[], - web3 + web3, + LoggerInstance ) assert(datatoken !== null) }) diff --git a/test/unit/balancer/Balancer.test.ts b/test/unit/balancer/Balancer.test.ts index 3e6e2f25..4bcc2592 100644 --- a/test/unit/balancer/Balancer.test.ts +++ b/test/unit/balancer/Balancer.test.ts @@ -75,7 +75,8 @@ describe('Balancer flow', () => { contracts.factoryAddress, factory.abi as AbiItem[], datatokensTemplate.abi as AbiItem[], - web3 + web3, + LoggerInstance ) assert(datatoken !== null) }) @@ -90,7 +91,8 @@ describe('Balancer flow', () => { contracts.factoryAddress, factory.abi as AbiItem[], datatokensTemplate.abi as AbiItem[], - web3 + web3, + LoggerInstance ) oceanTokenAddress = await oceandatatoken.create( blob, diff --git a/test/unit/exchanges/FixedPriceExchange.test.ts b/test/unit/exchanges/FixedPriceExchange.test.ts index 1b6fd336..6dabf765 100644 --- a/test/unit/exchanges/FixedPriceExchange.test.ts +++ b/test/unit/exchanges/FixedPriceExchange.test.ts @@ -10,6 +10,7 @@ import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json' import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json' import FixedRateExchangeContract = require('@oceanprotocol/contracts/artifacts/FixedRateExchange.json') +import { Logger } from '../../../src/lib' const web3 = new Web3('http://127.0.0.1:8545') describe('FixedRateExchange flow', () => { @@ -66,7 +67,8 @@ describe('FixedRateExchange flow', () => { contracts.factoryAddress, factory.abi as AbiItem[], datatokensTemplate.abi as AbiItem[], - web3 + web3, + LoggerInstance ) assert(datatoken !== null) }) @@ -89,7 +91,8 @@ describe('FixedRateExchange flow', () => { contracts.factoryAddress, factory.abi as AbiItem[], datatokensTemplate.abi as AbiItem[], - web3 + web3, + LoggerInstance ) oceanTokenAddress = await oceandatatoken.create( blob, @@ -208,7 +211,6 @@ describe('FixedRateExchange flow', () => { if (consoleDebug) console.log('Bob ocean balance:' + balance) }) it('Alice should update the rate', async () => { - // console.log(await FixedRateClass.getLogger()) const tx = await FixedRateClass.setRate(aliceExchangeId, updatedPriceRate, alice) assert(tx !== null) })