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

Simplify default test accounts creation in TesterBlockchain.

pull/899/head
David Núñez 2019-03-22 13:36:50 +01:00
parent 23253c71e1
commit 8216d6b39f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nucypher/utilities/sandbox/blockchain.py
View File

@ -64,7 +64,9 @@ class TesterBlockchain(Blockchain):
_PROVIDER_URI = 'tester://pyevm'
_instance = NO_BLOCKCHAIN_AVAILABLE
_test_account_cache = list()
_default_test_accounts = 10
# An account for each Ursula and a few extra for other actors
_default_test_accounts = NUMBER_OF_URSULAS_IN_DEVELOPMENT_NETWORK + 5
def __init__(self, test_accounts=None, poa=True, airdrop=False, *args, **kwargs):
if test_accounts is None:
@ -75,16 +77,11 @@ class TesterBlockchain(Blockchain):
self.attach_middleware(w3=self.interface.w3, poa=poa)
# Generate additional ethereum accounts for testing
population = test_accounts if test_accounts is not None else NUMBER_OF_URSULAS_IN_DEVELOPMENT_NETWORK
population = test_accounts
enough_accounts = len(self.interface.w3.eth.accounts) >= population
if test_accounts is not None and not enough_accounts:
if not enough_accounts:
accounts_to_make = population - len(self.interface.w3.eth.accounts)
test_accounts = test_accounts if test_accounts is not None else population
self.__generate_insecure_unlocked_accounts(quantity=accounts_to_make)
assert test_accounts == len(self.interface.w3.eth.accounts)
if airdrop is True: # ETH for everyone!

4
tests/fixtures.py
View File

@ -341,9 +341,7 @@ def testerchain(solidity_compiler):
provider_uri='tester://pyevm')
# Create the blockchain
testerchain = TesterBlockchain(interface=deployer_interface,
test_accounts=NUMBER_OF_URSULAS_IN_DEVELOPMENT_NETWORK,
airdrop=False)
testerchain = TesterBlockchain(interface=deployer_interface, airdrop=False)
origin, *everyone = testerchain.interface.w3.eth.accounts
deployer_interface.deployer_address = origin # Set the deployer address from a freshly created test account