Merge pull request #5893 from ethereum/nullrlp

testeth treat nullrlp as invalid
ethereum · Mar 2, 2020 · 2cc5937 · 2cc5937
2 parents a3b9320 + f730a09
commit 2cc5937
Show file tree

Hide file tree

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

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;
+554 −0		BlockchainTests/GeneralStateTests/stSelfBalance/selfBalanceCallTypes.json
+2,576 −148		BlockchainTests/InvalidBlocks/bcForgedTest/bcForkBlockTest.json
+0 −7,292		BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest.json
+37,644 −0		BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_.json
+24,594 −0		BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_.json
+3 −3		BlockchainTests/ValidBlocks/bcStateTests/TransactionNonceCheck.json
+116 −0		GeneralStateTests/stSelfBalance/selfBalanceCallTypes.json
+9 −0		PRLOG.md
+45 −0		RLPTests/invalidRLPTest.json
+8 −3		docs/test_types/blockchain_tests.rst
+0 −266		src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestCopier.json
+309 −0		src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestFiller.json
+0 −6,346		src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTestCopier.json
+4,429 −0		src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_Filler.json
+2,845 −0		src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_Filler.json
+3 −0		src/BlockchainTestsFiller/ValidBlocks/bcStateTests/TransactionNonceCheckFiller.json
+135 −0		src/GeneralStateTestsFiller/stSelfBalance/selfBalanceCallTypesFiller.json