aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-03-26 02:16:06 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-03-26 02:16:06 +0800
commitac558b0377ae30223347dae215b823b6b55e5046 (patch)
treebea576bb79080c0b23146eb2cb06c4ee38104230
parent94e4f410e9fd9257b7ccddcc8ce3b6d4c68798f9 (diff)
parent671254626a604932a322df112a9ee8841d08f80d (diff)
downloaddexon-solidity-ac558b0377ae30223347dae215b823b6b55e5046.tar.gz
dexon-solidity-ac558b0377ae30223347dae215b823b6b55e5046.tar.zst
dexon-solidity-ac558b0377ae30223347dae215b823b6b55e5046.zip
Merge branch 'develop' into 1351_tests
-rw-r--r--transaction.cpp7
-rw-r--r--ttTransactionTestFiller.json15
2 files changed, 22 insertions, 0 deletions
diff --git a/transaction.cpp b/transaction.cpp
index 77f6ecda..4c57326b 100644
--- a/transaction.cpp
+++ b/transaction.cpp
@@ -48,6 +48,13 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin)
if (!txFromRlp.signature().isValid())
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("transaction from RLP signature is invalid") );
}
+ catch(Exception const& _e)
+ {
+ cnote << i.first;
+ cnote << "Transaction Exception: " << diagnostic_information(_e);
+ BOOST_CHECK_MESSAGE(o.count("transaction") == 0, "A transaction object should not be defined because the RLP is invalid!");
+ continue;
+ }
catch(...)
{
BOOST_CHECK_MESSAGE(o.count("transaction") == 0, "A transaction object should not be defined because the RLP is invalid!");
diff --git a/ttTransactionTestFiller.json b/ttTransactionTestFiller.json
index 0058feac..c04b7684 100644
--- a/ttTransactionTestFiller.json
+++ b/ttTransactionTestFiller.json
@@ -571,6 +571,7 @@
"s" : "0x8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
}
},
+
"unpadedRValue": {
"transaction": {
"nonce": "13",
@@ -583,5 +584,19 @@
"v": "28",
"value": ""
}
+ },
+
+ "libsecp256k1test": {
+ "transaction": {
+ "nonce": "",
+ "gasPrice": "0x09184e72a000",
+ "gasLimit": "0x1388",
+ "to": "",
+ "data": "",
+ "r": "44",
+ "s": "4",
+ "v": "27",
+ "value": ""
+ }
}
}