Skip to content

Extend filter tests with dynamic types and longer block ranges #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 16, 2018
Merged

Extend filter tests with dynamic types and longer block ranges #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
543899d
Add dynamic and array event args to Emitter contract
dylanjw Aug 7, 2018
4f96710
Add argument filter tests
dylanjw Aug 9, 2018
8e898b7
Add topic filter tests
dylanjw Aug 13, 2018
1a8dab6
Add filter tests with +50 blocks
dylanjw Aug 13, 2018
423d1da
Add filtering test with many deployed contracts
dylanjw Aug 13, 2018
ead5b07
fix lint errors
dylanjw Aug 13, 2018
060f73b
Add wait to test contract deployment
dylanjw Aug 14, 2018
5cfc783
Remove hypothesis from slow filtering tests
dylanjw Aug 14, 2018
e7402c0
improve test arg readability
dylanjw Aug 14, 2018
ddfab83
Fix lint errors
dylanjw Aug 14, 2018
fa39d7a
Fix emit functions for logListArgs
dylanjw Aug 14, 2018
5caf0d9
Remove unecessary generators
dylanjw Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 35 additions & 20 deletions tests/core/contracts/contract_sources/Emitter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.0;
pragma solidity ^0.4.21;


contract Emitter {
Expand All @@ -19,6 +19,9 @@ contract Emitter {
event LogTripleWithIndex(uint arg0, uint indexed arg1, uint indexed arg2);
event LogQuadrupleWithIndex(uint arg0, uint arg1, uint indexed arg2, uint indexed arg3);
event LogDynamicArgs(string indexed arg0, string arg1);
event LogListArgs(bytes2[] indexed arg0, bytes2[] arg1);
event LogAddressIndexed(address indexed arg0, address arg1);
event LogAddressNotIndexed(address arg0, address arg1);

enum WhichEvent {
LogAnonymous,
Expand All @@ -35,41 +38,53 @@ contract Emitter {
LogQuadrupleWithIndex,
LogBytes,
LogString,
LogDynamicArgs
LogDynamicArgs,
LogListArgs,
LogAddressIndexed,
LogAddressNotIndexed
}

function logNoArgs(WhichEvent which) public {
if (which == WhichEvent.LogNoArguments) LogNoArguments();
else if (which == WhichEvent.LogAnonymous) LogAnonymous();
else throw;
if (which == WhichEvent.LogNoArguments) emit LogNoArguments();
else if (which == WhichEvent.LogAnonymous) emit LogAnonymous();
else revert("Didn't match any allowable event index");
}

function logSingle(WhichEvent which, uint arg0) public {
if (which == WhichEvent.LogSingleArg) LogSingleArg(arg0);
else if (which == WhichEvent.LogSingleWithIndex) LogSingleWithIndex(arg0);
else if (which == WhichEvent.LogSingleAnonymous) LogSingleAnonymous(arg0);
else throw;
if (which == WhichEvent.LogSingleArg) emit LogSingleArg(arg0);
else if (which == WhichEvent.LogSingleWithIndex) emit LogSingleWithIndex(arg0);
else if (which == WhichEvent.LogSingleAnonymous) emit LogSingleAnonymous(arg0);
else revert("Didn't match any allowable event index");
}

function logDouble(WhichEvent which, uint arg0, uint arg1) public {
if (which == WhichEvent.LogDoubleArg) LogDoubleArg(arg0, arg1);
else if (which == WhichEvent.LogDoubleWithIndex) LogDoubleWithIndex(arg0, arg1);
else if (which == WhichEvent.LogDoubleAnonymous) LogDoubleAnonymous(arg0, arg1);
else throw;
if (which == WhichEvent.LogDoubleArg) emit LogDoubleArg(arg0, arg1);
else if (which == WhichEvent.LogDoubleWithIndex) emit LogDoubleWithIndex(arg0, arg1);
else if (which == WhichEvent.LogDoubleAnonymous) emit LogDoubleAnonymous(arg0, arg1);
else revert("Didn't match any allowable event index");
}

function logTriple(WhichEvent which, uint arg0, uint arg1, uint arg2) public {
if (which == WhichEvent.LogTripleArg) LogTripleArg(arg0, arg1, arg2);
else if (which == WhichEvent.LogTripleWithIndex) LogTripleWithIndex(arg0, arg1, arg2);
else throw;
if (which == WhichEvent.LogTripleArg) emit LogTripleArg(arg0, arg1, arg2);
else if (which == WhichEvent.LogTripleWithIndex) emit LogTripleWithIndex(arg0, arg1, arg2);
else revert("Didn't match any allowable event index");
}

function logQuadruple(WhichEvent which, uint arg0, uint arg1, uint arg2, uint arg3) public {
if (which == WhichEvent.LogQuadrupleArg) LogQuadrupleArg(arg0, arg1, arg2, arg3);
else if (which == WhichEvent.LogQuadrupleWithIndex) LogQuadrupleWithIndex(arg0, arg1, arg2, arg3);
else throw;
if (which == WhichEvent.LogQuadrupleArg) emit LogQuadrupleArg(arg0, arg1, arg2, arg3);
else if (which == WhichEvent.LogQuadrupleWithIndex) emit LogQuadrupleWithIndex(arg0, arg1, arg2, arg3);
else revert("Didn't match any allowable event index");
}
function logDynamicArgs(string arg0, string arg1) public {
LogDynamicArgs(arg0, arg1);
emit LogDynamicArgs(arg0, arg1);
}
function logListArgs(bytes2[] arg0, bytes2[] arg1) public {
emit LogListArgs(arg0, arg1);
}
function logAddressIndexedArgs(address arg0, address arg1) public {
emit LogAddressIndexed(arg0, arg1);
}
function logAddressNotIndexedArgs(address arg0, address arg1) public {
emit LogAddressNotIndexed(arg0, arg1);
}
}
Loading