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

Style Changes 

New exception for values larger than 2**256
Auto format .json files
cl-refactor
winsvega 10 years ago
parent
6f4265a615
commit
d6ebb4454b
6 changed files with 261 additions and 261 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. 1
      libdevcore/Exceptions.h
  2. 13
      test/TestHelper.cpp

1
libdevcore/Exceptions.h
View File

@ -33,6 +33,7 @@ namespace dev
// base class for all exceptions // base class for all exceptions
struct Exception: virtual std::exception, virtual boost::exception { mutable std::string m_message; }; struct Exception: virtual std::exception, virtual boost::exception { mutable std::string m_message; };
struct ValueTooLarge: virtual Exception {};
struct BadHexCharacter: virtual Exception {}; struct BadHexCharacter: virtual Exception {};
struct RLPException: virtual Exception {}; struct RLPException: virtual Exception {};
struct BadCast: virtual RLPException {}; struct BadCast: virtual RLPException {};

13
test/TestHelper.cpp
View File

@ -110,9 +110,9 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936"); bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936");
if (bigint(o["balance"].get_str()) >= biValue256) if (bigint(o["balance"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("State 'balance' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'balance' is equal or greater than 2**256") );
if (bigint(o["nonce"].get_str()) >= biValue256) if (bigint(o["nonce"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("State 'nonce' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'nonce' is equal or greater than 2**256") );
Address address = Address(i.first); Address address = Address(i.first);
@ -148,14 +148,13 @@ void ImportTest::importTransaction(json_spirit::mObject& _o)
bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936"); bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936");
if (bigint(_o["nonce"].get_str()) >= biValue256) if (bigint(_o["nonce"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") );
if (bigint(_o["gasPrice"].get_str()) >= biValue256) if (bigint(_o["gasPrice"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'gasPrice' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasPrice' is equal or greater than 2**256") );
if (bigint(_o["gasLimit"].get_str()) >= biValue256) if (bigint(_o["gasLimit"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'gasLimit' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasLimit' is equal or greater than 2**256") );
if (bigint(_o["value"].get_str()) >= biValue256) if (bigint(_o["value"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'value' is equal or greater than 2**256") ); BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'value' is equal or greater than 2**256") );
m_transaction = _o["to"].get_str().empty() ? m_transaction = _o["to"].get_str().empty() ?
Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) : Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) :

Write Preview
Loading…
Cancel
Save