aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-10-03 18:35:51 +0800
committerGitHub <noreply@github.com>2017-10-03 18:35:51 +0800
commit5c284589202c261c06dadfe7a598cc23752e8e48 (patch)
tree365fa50e5c4af21b6cdf588680cf2b2768ab2b0f
parent9e101db45fddc0e8ec8efd564cd4685ebc22b639 (diff)
parente952946b229c626d677aed00d8dcb552292f674c (diff)
downloaddexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar.gz
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar.bz2
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar.lz
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar.xz
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.tar.zst
dexon-solidity-5c284589202c261c06dadfe7a598cc23752e8e48.zip
Merge pull request #2896 from ethereum/test-genesis
Format chainparams fields properly in tests
-rwxr-xr-xscripts/tests.sh4
-rw-r--r--test/RPCSession.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 5d7eb0e1..bf3e3455 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -42,8 +42,8 @@ elif [ -z $CI ]; then
ETH_PATH="eth"
else
mkdir -p /tmp/test
- wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth
- test "$(shasum /tmp/test/eth)" = "c132e8989229e4840831a4fb1a1d058b732a11d5 /tmp/test/eth"
+ wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth_byzantium
+ test "$(shasum /tmp/test/eth)" = "6e16ae5e0a0079d85fd63fb43547be3c52410e7e /tmp/test/eth"
sync
chmod +x /tmp/test/eth
sync # Otherwise we might get a "text file busy" error
diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index c4fbfefb..768c8c4b 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -217,11 +217,11 @@ void RPCSession::test_setChainParams(vector<string> const& _accounts)
{
"sealEngine": "NoProof",
"params": {
- "accountStartNonce": "0x",
+ "accountStartNonce": "0x00",
"maximumExtraDataSize": "0x1000000",
"blockReward": "0x",
- "allowFutureBlocks": "1",
- "homsteadForkBlock": "0x00",
+ "allowFutureBlocks": true,
+ "homesteadForkBlock": "0x00",
"EIP150ForkBlock": "0x00",
"EIP158ForkBlock": "0x00"
},