crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make DecodedLogEvent contain web3 log under a log subkey

Browse Source
This commit is contained in:
Leonid Logvinov
2017-11-23 10:01:23 -06:00
parent f97074dc84
commit e01468b492
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/src/contract_wrappers/contract_wrapper.ts
View File

@@ -100,7 +100,7 @@ export class ContractWrapper {
if (filterUtils.matchesFilter(log, filter)) { if (filterUtils.matchesFilter(log, filter)) {
const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>; const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>;
const logEvent = { const logEvent = {
...decodedLog, log: decodedLog,
removed, removed,
}; };
this._filterCallbacks[filterToken](null, logEvent); this._filterCallbacks[filterToken](null, logEvent);

5
packages/0x.js/src/types.ts
View File

@@ -40,7 +40,10 @@ export type OrderValues = [BigNumber, BigNumber, BigNumber,
BigNumber, BigNumber, BigNumber]; BigNumber, BigNumber, BigNumber];
export type LogEvent = Web3.LogEntryEvent; export type LogEvent = Web3.LogEntryEvent;
export type DecodedLogEvent<ArgsType> = Web3.DecodedLogEntryEvent<ArgsType>; export interface DecodedLogEvent<ArgsType> {
removed: boolean;
log: LogWithDecodedArgs<ArgsType>;
}
export type EventCallback<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void; export type EventCallback<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void;
export type EventWatcherCallback = (log: LogEvent) => void; export type EventWatcherCallback = (log: LogEvent) => void;

6
packages/0x.js/test/exchange_wrapper_test.ts
View File

@@ -649,7 +649,7 @@ describe('ExchangeWrapper', () => {
(async () => { (async () => {
const callback = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => { const callback = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
expect(logEvent.event).to.be.equal(ExchangeEvents.LogFill); expect(logEvent.log.event).to.be.equal(ExchangeEvents.LogFill);
done(); done();
}; };
await zeroEx.exchange.subscribeAsync( await zeroEx.exchange.subscribeAsync(
@@ -665,7 +665,7 @@ describe('ExchangeWrapper', () => {
(async () => { (async () => {
const callback = (err: Error, logEvent: DecodedLogEvent<LogCancelContractEventArgs>) => { const callback = (err: Error, logEvent: DecodedLogEvent<LogCancelContractEventArgs>) => {
expect(logEvent.event).to.be.equal(ExchangeEvents.LogCancel); expect(logEvent.log.event).to.be.equal(ExchangeEvents.LogCancel);
done(); done();
}; };
await zeroEx.exchange.subscribeAsync( await zeroEx.exchange.subscribeAsync(
@@ -688,7 +688,7 @@ describe('ExchangeWrapper', () => {
await zeroEx.setProviderAsync(newProvider); await zeroEx.setProviderAsync(newProvider);
const callback = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => { const callback = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
expect(logEvent.event).to.be.equal(ExchangeEvents.LogFill); expect(logEvent.log.event).to.be.equal(ExchangeEvents.LogFill);
done(); done();
}; };
await zeroEx.exchange.subscribeAsync( await zeroEx.exchange.subscribeAsync(

12
packages/0x.js/test/token_wrapper_test.ts
View File

@@ -361,10 +361,11 @@ describe('TokenWrapper', () => {
(async () => { (async () => {
const callback = (err: Error, logEvent: DecodedLogEvent<TransferContractEventArgs>) => { const callback = (err: Error, logEvent: DecodedLogEvent<TransferContractEventArgs>) => {
expect(logEvent).to.not.be.undefined(); expect(logEvent).to.not.be.undefined();
expect(logEvent.logIndex).to.be.equal(0); expect(logEvent.removed).to.be.false();
expect(logEvent.transactionIndex).to.be.equal(0); expect(logEvent.log.logIndex).to.be.equal(0);
expect(logEvent.blockNumber).to.be.a('number'); expect(logEvent.log.transactionIndex).to.be.equal(0);
const args = logEvent.args; expect(logEvent.log.blockNumber).to.be.a('number');
const args = logEvent.log.args;
expect(args._from).to.be.equal(coinbase); expect(args._from).to.be.equal(coinbase);
expect(args._to).to.be.equal(addressWithoutFunds); expect(args._to).to.be.equal(addressWithoutFunds);
expect(args._value).to.be.bignumber.equal(transferAmount); expect(args._value).to.be.bignumber.equal(transferAmount);
@@ -379,7 +380,8 @@ describe('TokenWrapper', () => {
(async () => { (async () => {
const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => { const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
expect(logEvent).to.not.be.undefined(); expect(logEvent).to.not.be.undefined();
const args = logEvent.args; expect(logEvent.removed).to.be.false();
const args = logEvent.log.args;
expect(args._owner).to.be.equal(coinbase); expect(args._owner).to.be.equal(coinbase);
expect(args._spender).to.be.equal(addressWithoutFunds); expect(args._spender).to.be.equal(addressWithoutFunds);
expect(args._value).to.be.bignumber.equal(allowanceAmount); expect(args._value).to.be.bignumber.equal(allowanceAmount);