Update parity version to 2.3.5 for integration tests

ethereum · Mar 21, 2019 · 317c083 · 317c083
1 parent a22c6cc
commit 317c083
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 211 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -193,26 +193,26 @@ jobs:
       - image: circleci/python:3.6-stretch
     environment:
       TOXENV: py36-integration-parity-ipc
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py36-integration-parity-http:
     <<: *parity_steps
     docker:
       - image: circleci/python:3.6-stretch
     environment:
       TOXENV: py36-integration-parity-http
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py36-integration-parity-ws:
     <<: *parity_steps
     docker:
       - image: circleci/python:3.6-stretch
     environment:
       TOXENV: py36-integration-parity-ws
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py36-integration-ethtester-pyevm:
     <<: *common
@@ -292,26 +292,26 @@ jobs:
       - image: circleci/python:3.7-stretch
     environment:
       TOXENV: py37-integration-parity-ipc
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py37-integration-parity-http:
     <<: *parity_steps
     docker:
       - image: circleci/python:3.7-stretch
     environment:
       TOXENV: py37-integration-parity-http
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py37-integration-parity-ws:
     <<: *parity_steps
     docker:
       - image: circleci/python:3.7-stretch
     environment:
       TOXENV: py37-integration-parity-ws
-      PARITY_VERSION: v1.11.11
-      PARITY_OS: debian
+      PARITY_VERSION: v2.3.5
+      PARITY_OS: linux
 
   py37-integration-ethtester-pyevm:
     <<: *common

diff --git a/.travis.yml b/.travis.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: .
     environment:
-      PARITY_VERSION: v1.11.7
+      PARITY_VERSION: v2.3.5
     volumes:
       - .:/code
     command: tail -f /dev/null
diff --git a/tests/integration/generate_fixtures/common.py b/tests/integration/generate_fixtures/common.py
@@ -12,6 +12,10 @@
     to_text,
 )
 
+from web3.exceptions import (
+    TransactionNotFound,
+)
+
 COINBASE = '0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd'
 COINBASE_PK = '0x58d23b55bc9cdce1f18c2500f40ff4ab7245df9a89505e9b1fa4851f623d241d'
 
@@ -33,7 +37,7 @@
         "eip150Block": 0,
         "eip155Block": 10,
         "eip158Block": 10,
-        "eip160Block": 10
+        "eip160Block": 10,
     },
     "nonce": "0x0000000000000042",
     "alloc": {
@@ -210,7 +214,10 @@ def mine_transaction_hash(web3, txn_hash):
     start_time = time.time()
     web3.geth.miner.start(1)
     while time.time() < start_time + 120:
-        receipt = web3.eth.getTransactionReceipt(txn_hash)
+        try:
+            receipt = web3.eth.getTransactionReceipt(txn_hash)
+        except TransactionNotFound:
+            continue
         if receipt is not None:
             web3.geth.miner.stop()
             return receipt
@@ -221,7 +228,7 @@ def mine_transaction_hash(web3, txn_hash):
 
 
 def deploy_contract(web3, name, factory):
-    web3.personal.unlockAccount(web3.eth.coinbase, KEYFILE_PW)
+    web3.geth.personal.unlockAccount(web3.eth.coinbase, KEYFILE_PW)
     deploy_txn_hash = factory.constructor().transact({'from': web3.eth.coinbase})
     print('{0}_CONTRACT_DEPLOY_HASH: '.format(name.upper()), deploy_txn_hash)
     deploy_receipt = mine_transaction_hash(web3, deploy_txn_hash)

diff --git a/tests/integration/generate_fixtures/go_ethereum.py b/tests/integration/generate_fixtures/go_ethereum.py
@@ -117,7 +117,7 @@ def setup_chain_state(web3):
     #
     # Block with Transaction
     #
-    web3.personal.unlockAccount(coinbase, common.KEYFILE_PW)
+    web3.geth.personal.unlockAccount(coinbase, common.KEYFILE_PW)
     web3.geth.miner.start(1)
     mined_txn_hash = web3.eth.sendTransaction({
         'from': coinbase,

diff --git a/tests/integration/generate_fixtures/parity.py b/tests/integration/generate_fixtures/parity.py
@@ -31,22 +31,22 @@
                 "durationLimit": "0x0d",
                 "blockReward": "0x4563918244F40000",
                 "homesteadTransition": 0,
-                "eip150Transition": 0,
-                "eip160Transition": 10,
-                "eip161abcTransition": 10,
-                "eip161dTransition": 10
             }
         }
     },
     "params": {
         "gasLimitBoundDivisor": "0x0400",
         "registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2",
+        "eip150Transition": 0,
         "eip155Transition": 10,
+        "eip160Transition": 10,
+        "eip161abcTransition": 10,
+        "eip161dTransition": 10,
         "accountStartNonce": "0x0",
         "maximumExtraDataSize": "0x20",
         "minGasLimit": "0x1388",
         "networkID": "0x539",
-        "eip98Transition": "0x7fffffffffffffff"
+        "eip98Transition": "0x7fffffffffffffff",
     },
     "genesis": {
         "seal": {
@@ -107,13 +107,12 @@ def get_parity_process(
         '--base-path', datadir,
         '--ipc-path', ipc_path,
         '--no-ws',
-        '--no-ui',
         '--no-warp',
         '--chain', chain_config_file_path,
         '--keys-path', keys_path,
-        '--rpcapi', 'all',
-        '--rpcport', parity_port,
-        # '--author', common.COINBASE[2:],
+        '--jsonrpc-apis', 'all',
+        '--jsonrpc-port', parity_port,
+        '--fat-db', 'on',
     )
     print(' '.join(run_command))
     try:
@@ -145,18 +144,18 @@ def parity_export_blocks_process(
         'blocks', os.path.join(datadir, 'blocks_export.rlp'),
         '--base-path', datadir,
         '--no-ws',
-        '--no-ui',
         '--no-warp',
         '--chain', chain_config_file_path,
-        '--rpcapi', 'all',
-        '--rpcport', parity_port,
-        # '--author', common.COINBASE[2:],
+        '--jsonrpc-apis', 'all',
+        '--jsonrpc-port', parity_port,
+        '--fat-db', 'on',
     )
     print(' '.join(run_command))
     try:
         proc = common.get_process(run_command)
         yield proc
     finally:
+        time.sleep(10)
         common.kill_proc_gracefully(proc)
         output, errors = proc.communicate()
         print(
@@ -241,6 +240,7 @@ def generate_parity_fixture(destination_dir):
 
         time.sleep(10)
         connect_nodes(web3, web3_geth)
+        time.sleep(10)
         wait_for_chain_sync(web3, fixture_block_count)
 
         static_data = {
@@ -262,7 +262,7 @@ def generate_parity_fixture(destination_dir):
 def connect_nodes(w3_parity, w3_secondary):
     parity_peers = w3_parity.parity.netPeers()
     parity_enode = w3_parity.parity.enode()
-    secondary_node_info = w3_secondary.geth.admin.nodeInfo
+    secondary_node_info = w3_secondary.geth.admin.nodeInfo()
     if secondary_node_info['id'] not in (node.get('id', tuple()) for node in parity_peers['peers']):
         w3_secondary.geth.admin.addPeer(parity_enode)
 

diff --git a/tests/integration/parity-187-fixture/blocks_export.rlp b/tests/integration/parity-187-fixture/blocks_export.rlp
diff --git a/tests/integration/parity-187-fixture/chain_config.json b/tests/integration/parity-187-fixture/chain_config.json
diff --git a/tests/integration/parity-187-fixture/network/key b/tests/integration/parity-187-fixture/network/key
diff --git a/tests/integration/parity-188-fixture/blocks_export.rlp b/tests/integration/parity-188-fixture/blocks_export.rlp
diff --git a/...CrossClient/UTC--2017-08-24T19-42-47.517572178Z--dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd b/...CrossClient/UTC--2017-08-24T19-42-47.517572178Z--dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd
diff --git a/tests/integration/parity-188-fixture/keys/CrossClient/address_book.json b/tests/integration/parity-188-fixture/keys/CrossClient/address_book.json
diff --git a/tests/integration/parity-188-fixture/network/key b/tests/integration/parity-188-fixture/network/key
diff --git a/tests/integration/parity-235-fixture/blocks_export.rlp b/tests/integration/parity-235-fixture/blocks_export.rlp
diff --git a/...tion/parity-188-fixture/chain_config.json → ...tion/parity-235-fixture/chain_config.json b/...tion/parity-188-fixture/chain_config.json → ...tion/parity-235-fixture/chain_config.json
@@ -1 +1 @@
-{"name": "CrossClient", "dataDir": "CrossClient", "engine": {"Ethash": {"params": {"minimumDifficulty": "0x020000", "difficultyBoundDivisor": "0x0800", "durationLimit": "0x0d", "blockReward": "0x4563918244F40000", "homesteadTransition": 0, "eip150Transition": 0, "eip160Transition": 10, "eip161abcTransition": 10, "eip161dTransition": 10}}}, "params": {"gasLimitBoundDivisor": "0x0400", "registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2", "eip155Transition": 10, "accountStartNonce": "0x0", "maximumExtraDataSize": "0x20", "minGasLimit": "0x1388", "networkID": "0x539", "eip98Transition": "0x7fffffffffffffff"}, "genesis": {"seal": {"ethereum": {"nonce": "0x0000000000000042", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"}}, "difficulty": "0x10000", "author": "0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd", "timestamp": "0x00", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "extraData": "0x3535353535353535353535353535353535353535353535353535353535353535", "gasLimit": "0x1000000"}, "accounts": {"0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "ecrecover", "pricing": {"linear": {"base": 3000, "word": 0}}}}, "0x12efdc31b1a8fa1a1e756dfd8a1601055c971e13": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "sha256", "pricing": {"linear": {"base": 60, "word": 12}}}}, "0x39EEed73fb1D3855E90Cbd42f348b3D7b340aAA6": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "ripemd160", "pricing": {"linear": {"base": 600, "word": 120}}}}}}
+{"name": "CrossClient", "dataDir": "CrossClient", "engine": {"Ethash": {"params": {"minimumDifficulty": "0x020000", "difficultyBoundDivisor": "0x0800", "durationLimit": "0x0d", "blockReward": "0x4563918244F40000", "homesteadTransition": 0}}}, "params": {"gasLimitBoundDivisor": "0x0400", "registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2", "eip150Transition": 0, "eip155Transition": 10, "eip160Transition": 10, "eip161abcTransition": 10, "eip161dTransition": 10, "accountStartNonce": "0x0", "maximumExtraDataSize": "0x20", "minGasLimit": "0x1388", "networkID": "0x539", "eip98Transition": "0x7fffffffffffffff"}, "genesis": {"seal": {"ethereum": {"nonce": "0x0000000000000042", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"}}, "difficulty": "0x10000", "author": "0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd", "timestamp": "0x00", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "extraData": "0x3535353535353535353535353535353535353535353535353535353535353535", "gasLimit": "0x1000000"}, "accounts": {"0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "ecrecover", "pricing": {"linear": {"base": 3000, "word": 0}}}}, "0x12efdc31b1a8fa1a1e756dfd8a1601055c971e13": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "sha256", "pricing": {"linear": {"base": 60, "word": 12}}}}, "0x39EEed73fb1D3855E90Cbd42f348b3D7b340aAA6": {"balance": "1000000000000000000000000000", "nonce": "0", "builtin": {"name": "ripemd160", "pricing": {"linear": {"base": 600, "word": 120}}}}}}
diff --git a/...-dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd → ...-dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd b/...-dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd → ...-dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd
diff --git a/...ixture/keys/CrossClient/address_book.json → ...ixture/keys/CrossClient/address_book.json b/...ixture/keys/CrossClient/address_book.json → ...ixture/keys/CrossClient/address_book.json
diff --git a/tests/integration/parity-235-fixture/network/key b/tests/integration/parity-235-fixture/network/key
@@ -0,0 +1 @@
+9cf55e75533a2380bcb2fbb4ff6f5ae86e7d303a331caf099946207bbe53fb21