diff options
| author | Vlad Gluhovsky <gluk256@gmail.com> | 2015-06-07 23:28:16 +0800 |
|---|---|---|
| committer | Vlad Gluhovsky <gluk256@gmail.com> | 2015-06-07 23:28:16 +0800 |
| commit | 2210af0c347aa1fba5af0f79a8f5d6ba9c885db0 (patch) | |
| tree | ad60ccfa41f42cda6caf957c08d54ee8d6c5a270 /TestHelper.cpp | |
| parent | 2eeaa750609123798429b298ff50144a9ed6fc62 (diff) | |
| parent | 6f12765591059c936527129bb19078ec88866ffb (diff) | |
| download | dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar.gz dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar.bz2 dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar.lz dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar.xz dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.tar.zst dexon-solidity-2210af0c347aa1fba5af0f79a8f5d6ba9c885db0.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 2c638494..f7da0238 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -262,7 +262,21 @@ void ImportTest::importTransaction(json_spirit::mObject& _o) { RLPStream transactionRLPStream = createRLPStreamFromTransactionFields(_o); RLP transactionRLP(transactionRLPStream.out()); - m_transaction = Transaction(transactionRLP.data(), CheckTransaction::Everything); + try + { + m_transaction = Transaction(transactionRLP.data(), CheckTransaction::Everything); + } + catch (InvalidSignature) + { + // create unsigned transaction + m_transaction = _o["to"].get_str().empty() ? + Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"])) : + Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), Address(_o["to"].get_str()), importData(_o), toInt(_o["nonce"])); + } + catch (Exception& _e) + { + cnote << "invalid transaction" << boost::diagnostic_information(_e); + } } } |