diff options
| author | Gav Wood <g@ethdev.com> | 2015-02-23 17:44:52 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-02-23 17:44:52 +0800 |
| commit | 9a764055ac69ceb9e5a16c4c930730255db13236 (patch) | |
| tree | 64debc1df79ca30aca55b3ba2c19aade2aaa84f6 | |
| parent | f9781f67299f486587738df7ada462b69f86fdd4 (diff) | |
| parent | 5554861fb3a135f2ee962f2ee2a1fd321143ea6e (diff) | |
| download | dexon-solidity-9a764055ac69ceb9e5a16c4c930730255db13236.tar.gz dexon-solidity-9a764055ac69ceb9e5a16c4c930730255db13236.tar.zst dexon-solidity-9a764055ac69ceb9e5a16c4c930730255db13236.zip | |
Merge pull request #1109 from CJentzsch/TransactionBugFix
Transaction bug fix
| -rw-r--r-- | TestHelper.cpp | 4 | ||||
| -rw-r--r-- | transaction.cpp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index ff6939a5..71d38103 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -475,11 +475,11 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun } catch (Exception const& _e) { - BOOST_ERROR("Failed test with Exception: " << diagnostic_information(_e)); + BOOST_ERROR("Failed filling test with Exception: " << diagnostic_information(_e)); } catch (std::exception const& _e) { - BOOST_ERROR("Failed test with Exception: " << _e.what()); + BOOST_ERROR("Failed filling test with Exception: " << _e.what()); } break; } diff --git a/transaction.cpp b/transaction.cpp index 7bd8ac20..6ebe6275 100644 --- a/transaction.cpp +++ b/transaction.cpp @@ -51,7 +51,7 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) catch(...) { BOOST_CHECK_MESSAGE(o.count("transaction") == 0, "A transaction object should not be defined because the RLP is invalid!"); - return; + continue; } BOOST_REQUIRE(o.count("transaction") > 0); @@ -108,6 +108,11 @@ BOOST_AUTO_TEST_CASE(TransactionTest) dev::test::executeTests("ttTransactionTest", "/TransactionTests", dev::test::doTransactionTests); } +BOOST_AUTO_TEST_CASE(ttWrongRLPTransaction) +{ + dev::test::executeTests("ttWrongRLPTransaction", "/TransactionTests", dev::test::doTransactionTests); +} + BOOST_AUTO_TEST_CASE(tt10mbDataField) { dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests); |