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

Simplify to/from block code

Browse Source
This commit is contained in:
Fabio Berger
2017-11-09 23:16:26 -05:00
parent 960c83315b
commit 0205f9ede3
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/order_watcher/event_watcher.ts
View File

@@ -53,19 +53,16 @@ export class EventWatcher {
this._lastEvents = pendingEvents; this._lastEvents = pendingEvents;
} }
private async _getEventsAsync(): Promise<Web3.LogEntry[]> { private async _getEventsAsync(): Promise<Web3.LogEntry[]> {
let fromBlock: BlockParamLiteral|number; let latestBlock: BlockParamLiteral|number;
let toBlock: BlockParamLiteral|number;
if (this._numConfirmations === 0) { if (this._numConfirmations === 0) {
fromBlock = BlockParamLiteral.Pending; latestBlock = BlockParamLiteral.Pending;
toBlock = fromBlock;
} else { } else {
const currentBlock = await this._web3Wrapper.getBlockNumberAsync(); const currentBlock = await this._web3Wrapper.getBlockNumberAsync();
toBlock = currentBlock - this._numConfirmations; latestBlock = currentBlock - this._numConfirmations;
fromBlock = toBlock;
} }
const eventFilter = { const eventFilter = {
fromBlock, fromBlock: latestBlock,
toBlock, toBlock: latestBlock,
}; };
const events = await this._web3Wrapper.getLogsAsync(eventFilter); const events = await this._web3Wrapper.getLogsAsync(eventFilter);
return events; return events;