Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix after rebasing

pull/2623/head
vzotova 2021-03-03 21:05:14 +03:00 committed by Kieran Prasch
parent ec7d44b4bd
commit 9284e5e63f
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/acceptance/blockchain/deployers/test_deployers_during_migration.py
View File

@ -33,32 +33,33 @@ def new_token_economics(token_economics):
@pytest.fixture(scope='module')
def baseline_deployment(staking_escrow_deployer):
staking_escrow_deployer.deploy(deployment_mode=constants.FULL)
def baseline_deployment(staking_escrow_deployer, transacting_power):
staking_escrow_deployer.deploy(deployment_mode=constants.FULL, transacting_power=transacting_power)
@pytest.fixture(scope='module')
def new_staking_escrow_deployer(testerchain, test_registry, new_token_economics):
staking_escrow_deployer = StakingEscrowDeployer(registry=test_registry,
economics=new_token_economics,
deployer_address=testerchain.etherbase_account)
economics=new_token_economics)
return staking_escrow_deployer
@pytest.fixture(scope='module')
def new_policy_manager_deployer(testerchain, test_registry, new_token_economics):
policy_manager_deployer = PolicyManagerDeployer(registry=test_registry,
economics=new_token_economics,
deployer_address=testerchain.etherbase_account)
economics=new_token_economics)
return policy_manager_deployer
def test_staking_escrow_preparation(testerchain,
transacting_power,
baseline_deployment,
token_economics,
test_registry,
new_staking_escrow_deployer):
new_staking_escrow_deployer.deploy(deployment_mode=constants.BARE, ignore_deployed=True)
new_staking_escrow_deployer.deploy(deployment_mode=constants.BARE,
ignore_deployed=True,
transacting_power=transacting_power)
# Data is still old, because there is no upgrade yet
staking_agent = ContractAgency.get_agent(StakingEscrowAgent, registry=test_registry)
@ -67,10 +68,13 @@ def test_staking_escrow_preparation(testerchain,
def test_policy_manager_preparation(testerchain,
transacting_power,
token_economics,
test_registry,
new_policy_manager_deployer):
new_policy_manager_deployer.deploy(deployment_mode=constants.BARE, ignore_deployed=True)
new_policy_manager_deployer.deploy(deployment_mode=constants.BARE,
ignore_deployed=True,
transacting_power=transacting_power)
# Data is still old, because there is no upgrade yet
policy_manager_agent = ContractAgency.get_agent(PolicyManagerAgent, registry=test_registry)
@ -79,6 +83,7 @@ def test_policy_manager_preparation(testerchain,
def test_staking_escrow_migration_upgrade(testerchain,
transacting_power,
test_registry,
new_token_economics,
new_staking_escrow_deployer):
@ -87,7 +92,8 @@ def test_staking_escrow_migration_upgrade(testerchain,
enrollment_version='latest')
new_staking_escrow_deployer.retarget(target_address=latest_staking_escrow.address,
confirmations=0)
confirmations=0,
transacting_power=transacting_power)
# Now data must be new
staking_agent = ContractAgency.get_agent(StakingEscrowAgent, registry=test_registry)
@ -96,6 +102,7 @@ def test_staking_escrow_migration_upgrade(testerchain,
def test_policy_manager_migration_upgrade(testerchain,
transacting_power,
test_registry,
new_token_economics,
new_policy_manager_deployer):
@ -104,7 +111,8 @@ def test_policy_manager_migration_upgrade(testerchain,
enrollment_version='latest')
new_policy_manager_deployer.retarget(target_address=latest_policy_manager.address,
confirmations=0)
confirmations=0,
transacting_power=transacting_power)
# Now data must be new
policy_manager_agent = ContractAgency.get_agent(PolicyManagerAgent, registry=test_registry)

6
tests/metrics/estimate_gas.py
View File

@ -32,6 +32,8 @@ from web3.contract import Contract
from nucypher.blockchain.eth.deployers import StakingEscrowDeployer, PolicyManagerDeployer
from nucypher.blockchain.eth.registry import InMemoryContractRegistry
from nucypher.blockchain.eth.signers.software import Web3Signer
from nucypher.crypto.powers import TransactingPower
from umbral.keys import UmbralPrivateKey
from umbral.signing import Signer
from unittest.mock import Mock
@ -598,9 +600,11 @@ def estimate_gas(analyzer: AnalyzeGas = None) -> None:
print("********* Estimates of migration *********")
registry = InMemoryContractRegistry()
deployer_power = TransactingPower(signer=Web3Signer(testerchain.client),
account=testerchain.etherbase_account)
def deploy_contract(contract_name, *args, **kwargs):
return testerchain.deploy_contract(testerchain.etherbase_account,
return testerchain.deploy_contract(deployer_power,
registry,
contract_name,
*args,