testeth treat null rlp as invalid

update blockchain tests to geth+retesteth
ethereum · Feb 29, 2020 · 80bada7 · 80bada7
1 parent a0774d9
commit 80bada7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [1.9.0] - Unreleased
 
+- Added: [#5893](https://github.com/ethereum/aleth/pull/5893) testeth: RlpTests treat empty `out` field as invalid.
 - Added: [#5868](https://github.com/ethereum/aleth/pull/5868) `test_importRawBlock` RPC method reports the detailed reason when import fails.
 - Removed: [#5885](https://github.com/ethereum/aleth/pull/5885) Discontinue `testeth --filltests` support for BlockchainTests, TransitionTests, BCGeneralStateTests.
 

diff --git a/test/jsontests b/test/jsontests
diff --git a/test/tools/jsontests/RLPTests.cpp b/test/tools/jsontests/RLPTests.cpp
@@ -87,6 +87,10 @@ void doRlpTests(json_spirit::mValue const& _input)
             bytes payloadToDecode = fromHex(o.at("out").get_str());
             RLP payload(payloadToDecode);
 
+            // treat null rlp as invalid
+            if (payload.isNull())
+                BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("RLPTests: field `out` is set to Null"));
+
             // attempt to read all the contents of RLP
             ostringstream() << payload;