Resolve web3 event filter deprecation warnings / inaccurate event records

tests/blockchain/eth/contracts/test_dispatcher.py

@@ -23,7 +23,7 @@ def test_dispatcher(web3, chain):
     contract2_bad_lib, _ = chain.provider.deploy_contract('ContractV2Bad')
     dispatcher, _ = chain.provider.deploy_contract('Dispatcher', contract1_lib.address)
 
-    upgrades = dispatcher.eventFilter('Upgraded')
+    upgrades = dispatcher.events.Upgraded.createFilter(fromBlock=0)
     assert dispatcher.call().target() == contract1_lib.address
 
     # events = upgrades.get_all_entries()
@@ -149,7 +149,7 @@ def test_dispatcher(web3, chain):
         chain.wait_for_receipt(tx)
     assert dispatcher.call().target() == contract2_lib.address
 
-    rollbacks = dispatcher.eventFilter('RolledBack')
+    rollbacks = dispatcher.events.RolledBack.createFilter(fromBlock=0)
 
     # But can rollback
     tx = dispatcher.transact({'from': creator}).rollback()
@@ -188,7 +188,7 @@ def test_dispatcher(web3, chain):
     #     abi=contract1_lib.abi,
     #     address=dispatcher.address,
     #     ContractFactoryClass=Contract)
-    # test_events = contract_instance.eventFilter('EventV1')
+    # test_events = contract_instance.events.EventV1.createFilter(fromBlock=0)
     # events = test_events.get_all_entries()
     # tx = contract_instance.transact({'from': creator}).createEvent(33)
     # chain.wait_for_receipt(tx)

tests/blockchain/eth/contracts/test_government.py

@@ -67,8 +67,8 @@ def test_voting(web3, chain, escrow, policy_manager):
         ContractFactoryClass=Contract
     )
 
-    voting_created_log = government.eventFilter('VotingCreated')
-    upgrade_committed_log = government.eventFilter('UpgradeCommitted')
+    voting_created_log = government.events.VotingCreated.createFilter(fromBlock=0)
+    upgrade_committed_log = government.events.UpgradeCommitted.createFilter(fromBlock=0)
 
     # Transfer ownership
     tx = government.transact({'from': creator}).transferOwnership(government.address)
@@ -262,8 +262,8 @@ def test_upgrade(web3, chain, escrow, policy_manager):
     policy_manager_library_v2, _ = chain.provider.deploy_contract('PolicyManagerV1Mock')
     policy_manager_library_v2 = policy_manager_library_v2.address
 
-    voting_created_log = government.eventFilter('VotingCreated')
-    upgrade_committed_log = government.eventFilter('UpgradeCommitted')
+    voting_created_log = government.events.VotingCreated.createFilter(fromBlock=0)
+    upgrade_committed_log = government.events.UpgradeCommitted.createFilter(fromBlock=0)
 
     # Transfer ownership
     tx = government.transact({'from': creator}).transferOwnership(government.address)

tests/blockchain/eth/contracts/test_issuer.py

@@ -25,7 +25,7 @@ def test_issuer(web3, chain, token):
     tx = token.transact({'from': creator}).transfer(issuer.address, reserved_reward)
     chain.wait_for_receipt(tx)
 
-    events = issuer.eventFilter('Initialized')
+    events = issuer.events.Initialized.createFilter(fromBlock=0)
     tx = issuer.transact({'from': creator}).initialize()
     chain.wait_for_receipt(tx)
     events = events.get_all_entries()

tests/blockchain/eth/contracts/test_miners_escrow.py

@@ -55,11 +55,11 @@ def test_escrow(web3, chain, token, escrow_contract):
     creator = web3.eth.accounts[0]
     ursula1 = web3.eth.accounts[1]
     ursula2 = web3.eth.accounts[2]
-    deposit_log = escrow.eventFilter('Deposited')
-    lock_log = escrow.eventFilter('Locked')
-    activity_log = escrow.eventFilter('ActivityConfirmed')
-    switching_lock_log = escrow.eventFilter('LockSwitched')
-    withdraw_log = escrow.eventFilter('Withdrawn')
+    deposit_log = escrow.events.Deposited.createFilter(fromBlock=0)
+    lock_log = escrow.events.Locked.createFilter(fromBlock=0)
+    activity_log = escrow.events.ActivityConfirmed.createFilter(fromBlock=0)
+    switching_lock_log = escrow.events.LockSwitched.createFilter(fromBlock=0)
+    withdraw_log = escrow.events.Withdrawn.createFilter(fromBlock=0)
 
     # Give Ursula and Ursula(2) some coins
     tx = token.transact({'from': creator}).transfer(ursula1, 10000)
@@ -410,12 +410,13 @@ def test_mining(web3, chain, token, escrow_contract):
     creator = web3.eth.accounts[0]
     ursula1 = web3.eth.accounts[1]
     ursula2 = web3.eth.accounts[2]
-    mining_log = escrow.eventFilter('Mined')
-    deposit_log = escrow.eventFilter('Deposited')
-    lock_log = escrow.eventFilter('Locked')
-    activity_log = escrow.eventFilter('ActivityConfirmed')
-    switching_lock_log = escrow.eventFilter('LockSwitched')
-    withdraw_log = escrow.eventFilter('Withdrawn')
+
+    mining_log = escrow.events.Mined.createFilter(fromBlock=0)
+    deposit_log = escrow.events.Deposited.createFilter(fromBlock=0)
+    lock_log = escrow.events.Locked.createFilter(fromBlock=0)
+    activity_log = escrow.events.ActivityConfirmed.createFilter(fromBlock=0)
+    switching_lock_log = escrow.events.LockSwitched.createFilter(fromBlock=0)
+    withdraw_log = escrow.events.Withdrawn.createFilter(fromBlock=0)
 
     # Give Escrow tokens for reward and initialize contract
     tx = token.transact({'from': creator}).transfer(escrow.address, 10 ** 9)
@@ -631,7 +632,7 @@ def test_mining(web3, chain, token, escrow_contract):
 def test_pre_deposit(web3, chain, token, escrow_contract):
     escrow = escrow_contract(1500)
     creator = web3.eth.accounts[0]
-    deposit_log = escrow.eventFilter('Deposited')
+    deposit_log = escrow.events.Deposited.createFilter(fromBlock=0)
 
     # Initialize Escrow contract
     tx = escrow.transact({'from': creator}).initialize()

tests/blockchain/eth/contracts/test_policy_manager.py

@@ -84,11 +84,11 @@ def test_create_revoke(web3, chain, escrow, policy_manager):
     node2 = web3.eth.accounts[4]
     node3 = web3.eth.accounts[5]
     client_balance = web3.eth.getBalance(client)
-    policy_created_log = policy_manager.eventFilter('PolicyCreated')
-    arrangement_revoked_log = policy_manager.eventFilter('ArrangementRevoked')
-    policy_revoked_log = policy_manager.eventFilter('PolicyRevoked')
-    arrangement_refund_log = policy_manager.eventFilter('RefundForArrangement')
-    policy_refund_log = policy_manager.eventFilter('RefundForPolicy')
+    policy_created_log = policy_manager.events.PolicyCreated.createFilter(fromBlock=0)
+    arrangement_revoked_log = policy_manager.events.ArrangementRevoked.createFilter(fromBlock=0)
+    policy_revoked_log = policy_manager.events.PolicyRevoked.createFilter(fromBlock=0)
+    arrangement_refund_log = policy_manager.events.RefundForArrangement.createFilter(fromBlock=0)
+    policy_refund_log = policy_manager.events.RefundForPolicy.createFilter(fromBlock=0)
 
     # Try create policy for bad node
     with pytest.raises((TransactionFailed, ValueError)):
@@ -271,7 +271,7 @@ def test_reward(web3, chain, escrow, policy_manager):
     node2 = web3.eth.accounts[4]
     node3 = web3.eth.accounts[5]
     node_balance = web3.eth.getBalance(node1)
-    withdraw_log = policy_manager.eventFilter('Withdrawn')
+    withdraw_log = policy_manager.events.Withdrawn.createFilter(fromBlock=0)
 
     # Mint period without policies
     period = escrow.call().getCurrentPeriod()
@@ -333,16 +333,17 @@ def test_reward(web3, chain, escrow, policy_manager):
 
 
 def test_refund(web3, chain, escrow, policy_manager):
+    creator = web3.eth.accounts[0]
     client = web3.eth.accounts[1]
     node1 = web3.eth.accounts[3]
     node2 = web3.eth.accounts[4]
     node3 = web3.eth.accounts[5]
     client_balance = web3.eth.getBalance(client)
-    policy_created_log = policy_manager.eventFilter('PolicyCreated')
-    arrangement_revoked_log = policy_manager.eventFilter('ArrangementRevoked')
-    policy_revoked_log = policy_manager.eventFilter('PolicyRevoked')
-    arrangement_refund_log = policy_manager.eventFilter('RefundForArrangement')
-    policy_refund_log = policy_manager.eventFilter('RefundForPolicy')
+    policy_created_log = policy_manager.events.PolicyCreated.createFilter(fromBlock=0)
+    arrangement_revoked_log = policy_manager.events.ArrangementRevoked.createFilter(fromBlock=0)
+    policy_revoked_log = policy_manager.events.PolicyRevoked.createFilter(fromBlock=0)
+    arrangement_refund_log = policy_manager.events.RefundForArrangement.createFilter(fromBlock=0)
+    policy_refund_log = policy_manager.events.RefundForPolicy.createFilter(fromBlock=0)
 
     # Create policy
     tx = policy_manager.transact({'from': client, 'value': value, 'gas_price': 0}) \

tests/blockchain/eth/contracts/test_user_escrow.py

@@ -46,7 +46,7 @@ def user_escrow(web3, chain, token, escrow, policy_manager):
 def test_escrow(web3, chain, token, user_escrow):
     creator = web3.eth.accounts[0]
     user = web3.eth.accounts[1]
-    deposits = user_escrow.eventFilter('Deposited')
+    deposits = user_escrow.events.Deposited.createFilter(fromBlock=0)
 
     # Deposit some tokens to the user escrow and lock them
     tx = token.transact({'from': creator}).approve(user_escrow.address, 2000)
@@ -80,7 +80,7 @@ def test_escrow(web3, chain, token, user_escrow):
     chain.wait_for_receipt(tx)
     assert 2000 == token.call().balanceOf(user_escrow.address)
 
-    withdraws = user_escrow.eventFilter('Withdrawn')
+    withdraws = user_escrow.events.Withdrawn.createFilter(fromBlock=0)
 
     # Only user can withdraw available tokens
     with pytest.raises((TransactionFailed, ValueError)):
@@ -137,7 +137,7 @@ def test_miner(web3, chain, token, escrow, user_escrow):
     creator = web3.eth.accounts[0]
     user = web3.eth.accounts[1]
 
-    deposits = user_escrow.eventFilter('Deposited')
+    deposits = user_escrow.events.Deposited.createFilter(fromBlock=0)
 
     # Deposit some tokens to the user escrow and lock them
     tx = token.transact({'from': creator}).approve(user_escrow.address, 1000)
@@ -160,7 +160,7 @@ def test_miner(web3, chain, token, escrow, user_escrow):
         tx = user_escrow.transact({'from': user}).minerDeposit(10000, 5)
         chain.wait_for_receipt(tx)
 
-    miner_deposits = user_escrow.eventFilter('DepositedAsMiner')
+    miner_deposits = user_escrow.events.DepositedAsMiner.createFilter(fromBlock=0)
 
     # Deposit some tokens to the miners escrow
     tx = user_escrow.transact({'from': user}).minerDeposit(1500, 5)
@@ -206,12 +206,12 @@ def test_miner(web3, chain, token, escrow, user_escrow):
         tx = escrow.transact({'from': user}).withdrawAll()
         chain.wait_for_receipt(tx)
 
-    locks = user_escrow.eventFilter('Locked')
-    switches = user_escrow.eventFilter('LockSwitched')
-    confirms = user_escrow.eventFilter('ActivityConfirmed')
-    mints = user_escrow.eventFilter('Mined')
-    miner_withdraws = user_escrow.eventFilter('WithdrawnAsMiner')
-    withdraws = user_escrow.eventFilter('Withdrawn')
+    locks = user_escrow.events.Locked.createFilter(fromBlock=0)
+    switches = user_escrow.events.LockSwitched.createFilter(fromBlock=0)
+    confirms = user_escrow.events.ActivityConfirmed.createFilter(fromBlock=0)
+    mints = user_escrow.events.Mined.createFilter(fromBlock=0)
+    miner_withdraws = user_escrow.events.WithdrawnAsMiner.createFilter(fromBlock=0)
+    withdraws = user_escrow.events.Withdrawn.createFilter(fromBlock=0)
 
 
     # Use methods through the user escrow
@@ -314,8 +314,8 @@ def test_policy(web3, chain, policy_manager, user_escrow):
     tx = web3.eth.sendTransaction({'from': web3.eth.coinbase, 'to': policy_manager.address, 'value': 10000})
     chain.wait_for_receipt(tx)
 
-    miner_collections = user_escrow.eventFilter('RewardWithdrawnAsMiner')
-    rewards = user_escrow.eventFilter('RewardWithdrawn')
+    miner_collections = user_escrow.events.RewardWithdrawnAsMiner.createFilter(fromBlock=0)
+    rewards = user_escrow.events.RewardWithdrawn.createFilter(fromBlock=0)
 
     # Withdraw reward reward
     tx = user_escrow.transact({'from': user, 'gas_price': 0}).policyRewardWithdraw()