Compare commits

..

10 Commits

Author SHA1 Message Date
nolash
a5f9eace3f Bump cic-notify 2021-06-30 18:43:58 +02:00
nolash
a9f4f1ccda Bump cic-eth dep for cic-ussd 2021-06-30 18:35:45 +02:00
nolash
67eb3137cf bump cic-eth version 2021-06-30 18:34:46 +02:00
nolash
ae870d175f for real update requirements 2021-06-30 17:58:52 +02:00
nolash
2b43f8a47d Upgrade eth-erc20 via cic-base 2021-06-30 17:44:52 +02:00
nolash
a8291f49ab Move test contract data to pytest module 2021-06-30 17:27:47 +02:00
nolash
2e3f8a0bf1 Merge remote-tracking branch 'origin/master' into lash/allowance 2021-06-30 16:45:06 +02:00
nolash
407b29cef5 Add allowance and transfer from test 2021-06-29 15:08:05 +02:00
nolash
75c6609dff Correct task conftest fixture path 2021-06-29 09:34:12 +02:00
nolash
6a45d5faa7 Move pytest fixtures to importable location, add allowance check for transfer from 2021-06-29 08:21:11 +02:00
2 changed files with 2 additions and 8 deletions

View File

@@ -10,7 +10,7 @@ import redis
import celery
from cic_eth_registry.registry import CICRegistry
from chainsyncer.backend.memory import MemBackend
from chainsyncer.driver.head import HeadSyncer
from chainsyncer.driver import HeadSyncer
from chainlib.eth.connection import EthHTTPConnection
from chainlib.chain import ChainSpec
from chainlib.eth.gas import RPCGasOracle
@@ -24,7 +24,6 @@ from cic_base import (
rpc,
signer as signer_funcs,
)
from cic_base.eth.syncer import chain_interface
# local imports
#import common
@@ -121,7 +120,7 @@ def main():
'api_queue': config.get('_CELERY_QUEUE'),
}
syncer = HeadSyncer(syncer_backend, chain_interface, block_callback=handler.refresh)
syncer = HeadSyncer(syncer_backend, block_callback=handler.refresh)
syncer.add_filter(handler)
syncer.loop(1, conn)

View File

@@ -254,10 +254,6 @@ class Verifier:
if len(k) > 7 and k[:7] == 'verify_':
logg.debug('verifier has verify method {}'.format(k))
verifymethods.append(k[7:])
o = self.faucet_tx_factory.token_amount(self.faucet_address, sender_address=ZERO_ADDRESS)
r = self.conn.do(o)
self.faucet_amount = self.faucet_tx_factory.parse_token_amount(r)
logg.info('faucet amount set to {} at verify initialization time'.format(self.faucet_amount))
self.state = VerifierState(verifymethods, active_tests=active_tests)
@@ -288,7 +284,6 @@ class Verifier:
except ValueError:
actual_balance = int(r)
balance = int(balance / 1000000) * 1000000
balance += self.faucet_amount
logg.debug('balance for {}: {}'.format(address, balance))
if balance != actual_balance:
raise VerifierError((actual_balance, balance), 'balance')