From 6ffcaec8e93487b52f61749edce0789ccc5351e4 Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 17 Mar 2021 11:23:24 +0100 Subject: [PATCH] Update nonce, gas oracle naming --- python/contract_registry/pytest/fixtures_registry.py | 4 ++-- python/tests/test_basic.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/contract_registry/pytest/fixtures_registry.py b/python/contract_registry/pytest/fixtures_registry.py index 14e2010..27c0247 100644 --- a/python/contract_registry/pytest/fixtures_registry.py +++ b/python/contract_registry/pytest/fixtures_registry.py @@ -8,7 +8,7 @@ from hexathon import add_0x import pytest from chainlib.connection import RPCConnection from chainlib.eth.tx import receipt -from chainlib.eth.nonce import NodeNonceOracle +from chainlib.eth.nonce import RPCNonceOracle # local imports from contract_registry.registry import Registry @@ -40,7 +40,7 @@ def registry( roles, ): - nonce_oracle = NodeNonceOracle(roles['CONTRACT_DEPLOYER'], eth_rpc) + nonce_oracle = RPCNonceOracle(roles['CONTRACT_DEPLOYER'], eth_rpc) builder = Registry(signer=eth_signer, nonce_oracle=nonce_oracle) (tx_hash_hex, o) = builder.constructor(roles['CONTRACT_DEPLOYER'], valid_identifiers) diff --git a/python/tests/test_basic.py b/python/tests/test_basic.py index 3c66cc6..a061605 100644 --- a/python/tests/test_basic.py +++ b/python/tests/test_basic.py @@ -14,7 +14,7 @@ from chainlib.eth.contract import ( ABIContractType, abi_decode_single, ) -from chainlib.eth.nonce import NodeNonceOracle +from chainlib.eth.nonce import RPCNonceOracle from chainlib.eth.address import to_checksum_address from hexathon import ( add_0x, @@ -44,7 +44,7 @@ def test_set( bogus_hash = add_0x(os.urandom(32).hex()) #conn = RPCConnection.connect('default') - nonce_oracle = NodeNonceOracle(eth_accounts[0], eth_rpc) + nonce_oracle = RPCNonceOracle(eth_accounts[0], eth_rpc) builder = Registry(signer=eth_signer, nonce_oracle=nonce_oracle) (tx_hash_hex, o) = builder.set(registry, eth_accounts[0], 'ContractRegistry', addr_registry, bogus_hash, bogus_hash) r = eth_rpc.do(o)