lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Check State 

Style Changes
cl-refactor
winsvega 10 years ago
parent
9a27f379f1
commit
26257a191d
3 changed files with 5 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      test/TestHelper.cpp
  2. 6
      test/TestHelper.h
  3. 2
      test/stTransactionTestFiller.json

8
test/TestHelper.cpp
View File

@ -205,13 +205,7 @@ void ImportTest::importTransaction(json_spirit::mObject& _o)
} }
} }
void ImportTest::checkExpectedState(State const& _stateExpect, State const& _statePost, WhenError _throw) void ImportTest::checkExpectedState(State const& _stateExpect, State const& _statePost, stateOptionsMap const _expectedStateOptions, WhenError _throw)
{
stateOptionsMap defaultMap;
checkExpectedState(_stateExpect, _statePost, defaultMap, _throw);
}
void ImportTest::checkExpectedState(State const& _stateExpect, State const& _statePost, stateOptionsMap const& _expectedStateOptions, WhenError _throw)
{ {
#define CHECK(a,b) \ #define CHECK(a,b) \
if (_throw == WhenError::Throw) \ if (_throw == WhenError::Throw) \

6
test/TestHelper.h
View File

@ -99,8 +99,7 @@ namespace test
struct ImportStateOptions struct ImportStateOptions
{ {
ImportStateOptions():m_bHasBalance(false), m_bHasNonce(false), m_bHasCode(false), m_bHasStorage(false) {} ImportStateOptions(bool _bSetAll = false):m_bHasBalance(_bSetAll), m_bHasNonce(_bSetAll), m_bHasCode(_bSetAll), m_bHasStorage(_bSetAll) {}
ImportStateOptions(bool _bSetAll):m_bHasBalance(_bSetAll), m_bHasNonce(_bSetAll), m_bHasCode(_bSetAll), m_bHasStorage(_bSetAll) {}
bool isAllSet() {return m_bHasBalance && m_bHasNonce && m_bHasCode && m_bHasStorage;} bool isAllSet() {return m_bHasBalance && m_bHasNonce && m_bHasCode && m_bHasStorage;}
bool m_bHasBalance; bool m_bHasBalance;
bool m_bHasNonce; bool m_bHasNonce;
@ -121,8 +120,7 @@ public:
void importTransaction(json_spirit::mObject& _o); void importTransaction(json_spirit::mObject& _o);
void exportTest(bytes const& _output, eth::State const& _statePost); void exportTest(bytes const& _output, eth::State const& _statePost);
static void checkExpectedState(eth::State const& _stateExpect, eth::State const& _statePost, WhenError _throw = WhenError::Throw); static void checkExpectedState(eth::State const& _stateExpect, eth::State const& _statePost, stateOptionsMap const _expectedStateOptions = stateOptionsMap(), WhenError _throw = WhenError::Throw);
static void checkExpectedState(eth::State const& _stateExpect, eth::State const& _statePost, stateOptionsMap const& _expectedStateOptions, WhenError _throw = WhenError::Throw);
eth::State m_statePre; eth::State m_statePre;
eth::State m_statePost; eth::State m_statePost;

2
test/stTransactionTestFiller.json
View File

@ -278,6 +278,7 @@
}, },
"expect" : { "expect" : {
"c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0",
"storage" : { "storage" : {
} }
} }
@ -331,6 +332,7 @@
}, },
"expect" : { "expect" : {
"c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0",
"storage" : { "storage" : {
} }
} }

Write Preview
Loading…
Cancel
Save