support tr data "" == "0x"

support int and "int" in eth_getTransactionCount
ethereum · Feb 4, 2020 · 453e1b7 · 453e1b7
1 parent 6d37c10
commit 453e1b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/retesteth/RPCSession.cpp b/retesteth/RPCSession.cpp
@@ -320,7 +320,8 @@ int RPCSession::eth_getTransactionCount(
     std::string const& _address, std::string const& _blockNumber)
 {
     DataObject res = rpcCall("eth_getTransactionCount", {quote(_address), quote(_blockNumber)});
-    return (res.type() == DataType::String) ? (int)u256(dev::fromHex(res.asString())) : res.asInt();
+    return (res.type() == DataType::String) ? test::hexOrDecStringToInt(res.asString()) :
+                                              res.asInt();
 }
 
 string RPCSession::eth_getBalance(string const& _address, string const& _blockNumber)

diff --git a/retesteth/testSuites/blockchain/BlockchainTestLogic.cpp b/retesteth/testSuites/blockchain/BlockchainTestLogic.cpp
@@ -115,7 +115,13 @@ void RunTest(DataObject const& _testObject, TestSuite::TestSuiteOptions const& _
                                     string const& aField, string const& bField, size_t length = 1) {
                     bool condition = true;
                     if (length == 0)  // skip conversion
+                    {
                         condition = tr.atKey(aField).asString() == testTr.atKey(bField).asString();
+                        // transaction data returned by aleth is "" instead of "0x" in blockchain
+                        // tests
+                        condition = condition || "0x" + tr.atKey(aField).asString() ==
+                                                     testTr.atKey(bField).asString();
+                    }
                     else
                         condition =
                             dev::toCompactHexPrefixed(dev::u256(tr.atKey(aField).asString()),