mirror of
git://holbrook.no/eth-faucet
synced 2026-04-27 10:21:04 +02:00
Fix inverted balance check in period, faucet main
This commit is contained in:
lash
@@ -15,26 +15,13 @@ from chainlib.eth.gas import OverrideGasOracle
|
||||
|
||||
# local import
|
||||
from eth_faucet import EthFaucet
|
||||
from eth_faucet.unittest import TestFaucetBase
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
logg = logging.getLogger()
|
||||
|
||||
|
||||
class TestFaucet(EthTesterCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestFaucet, self).setUp()
|
||||
self.conn = RPCConnection.connect(self.chain_spec, 'default')
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.constructor(self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
|
||||
o = receipt(r)
|
||||
r = self.conn.do(o)
|
||||
self.address = to_checksum_address(r['contract_address'])
|
||||
logg.debug('faucet contract {}'.format(self.address))
|
||||
|
||||
class TestFaucet(TestFaucetBase):
|
||||
|
||||
def test_basic(self):
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
@@ -55,6 +42,10 @@ class TestFaucet(EthTesterCase):
|
||||
|
||||
|
||||
def test_basic_funding(self):
|
||||
o = balance(self.accounts[2])
|
||||
r = self.conn.do(o)
|
||||
prebalance = int(r, 16)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.give_to(self.address, self.accounts[0], self.accounts[2])
|
||||
@@ -63,28 +54,18 @@ class TestFaucet(EthTesterCase):
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
o = balance(self.accounts[9])
|
||||
r = self.conn.do(o)
|
||||
prebalance = int(r, 16)
|
||||
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
o = balance(self.accounts[2])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), prebalance)
|
||||
|
||||
(tx_hash, o) = c.set_amount(self.address, self.accounts[0], 1000)
|
||||
r = self.conn.do(o)
|
||||
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
(tx_hash_hex, o) = c.give_to(self.address, self.accounts[0], self.accounts[2])
|
||||
self.conn.do(o)
|
||||
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 0)
|
||||
@@ -146,6 +127,7 @@ class TestFaucet(EthTesterCase):
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), prebalance - cost + 1000)
|
||||
|
||||
|
||||
def test_payable_with_tx_data(self):
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
@@ -169,5 +151,7 @@ class TestFaucet(EthTesterCase):
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), prebalance - cost)
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
82
python/tests/test_check.py
Normal file
82
python/tests/test_check.py
Normal file
@@ -0,0 +1,82 @@
|
||||
# standard imports
|
||||
import os
|
||||
import unittest
|
||||
import logging
|
||||
|
||||
# external imports
|
||||
from chainlib.connection import RPCConnection
|
||||
from chainlib.eth.nonce import RPCNonceOracle
|
||||
from chainlib.eth.unittest.ethtester import EthTesterCase
|
||||
from chainlib.eth.tx import receipt
|
||||
from chainlib.eth.address import to_checksum_address
|
||||
from chainlib.eth.gas import balance
|
||||
from chainlib.eth.gas import Gas
|
||||
from chainlib.eth.gas import OverrideGasOracle
|
||||
|
||||
# local import
|
||||
from eth_faucet import EthFaucet
|
||||
from eth_faucet.unittest import TestFaucetFullBase
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
logg = logging.getLogger()
|
||||
|
||||
|
||||
class TestFaucet(TestFaucetFullBase):
|
||||
|
||||
def test_check_registry(self):
|
||||
c = EthFaucet(self.chain_spec)
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 1)
|
||||
|
||||
o = c.check(self.address, self.accounts[2], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 0)
|
||||
|
||||
|
||||
def test_check_period_time(self):
|
||||
self.set_period(100)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[1], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 1)
|
||||
|
||||
(tx_hash_hex, o) = c.gimme(self.address, self.accounts[1])
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 0)
|
||||
|
||||
|
||||
def test_check_period_balance(self):
|
||||
o = balance(self.accounts[1])
|
||||
r = self.conn.do(o)
|
||||
prebalance = int(r, 16)
|
||||
|
||||
c = EthFaucet(self.chain_spec)
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 1)
|
||||
|
||||
self.set_threshold(prebalance + 1)
|
||||
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 1)
|
||||
|
||||
self.set_threshold(prebalance)
|
||||
|
||||
o = c.check(self.address, self.accounts[1], sender_address=self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(int(r, 16), 0)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -20,82 +20,16 @@ from chainlib.eth.block import block_by_number
|
||||
# local imports
|
||||
from eth_faucet import EthFaucet
|
||||
from eth_faucet.period import PeriodSimple
|
||||
from eth_faucet.unittest import TestFaucetPeriodBase
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
logg = logging.getLogger()
|
||||
|
||||
|
||||
|
||||
moddir = os.path.dirname(__file__)
|
||||
datadir = os.path.join(moddir, '..', 'eth_faucet', 'data')
|
||||
|
||||
|
||||
class TestFaucetPeriod(EthTesterCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestFaucetPeriod, self).setUp()
|
||||
# DRY
|
||||
self.conn = RPCConnection.connect(self.chain_spec, 'default')
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = PeriodSimple(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.constructor(self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
|
||||
f = open(os.path.join(datadir, 'PeriodSimple.bin'))
|
||||
period_store_bytecode = f.read()
|
||||
f.close()
|
||||
enc = ABIContractEncoder()
|
||||
code = enc.get()
|
||||
|
||||
c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
tx = c.template(self.accounts[0], None, use_nonce=True)
|
||||
tx = c.set_code(tx, period_store_bytecode)
|
||||
(tx_hash_hex, o) = c.build(tx)
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
self.period_store_address = r['contract_address']
|
||||
|
||||
o = block_by_number(r['block_number'])
|
||||
r = self.conn.do(o)
|
||||
|
||||
try:
|
||||
self.start_time = int(r['timestamp'], 16)
|
||||
except TypeError:
|
||||
self.start_time = int(r['timestamp'])
|
||||
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.constructor(self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
|
||||
o = receipt(r)
|
||||
r = self.conn.do(o)
|
||||
self.address = to_checksum_address(r['contract_address'])
|
||||
logg.debug('faucet contract {}'.format(self.address))
|
||||
|
||||
(tx_hash_hex, o) = c.set_period_checker(self.address, self.accounts[0], self.period_store_address)
|
||||
self.conn.do(o)
|
||||
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
enc = ABIContractEncoder()
|
||||
enc.method('setPoker')
|
||||
enc.typ(ABIContractType.ADDRESS)
|
||||
enc.address(self.address)
|
||||
data = enc.get()
|
||||
tx = c.template(self.accounts[0], self.period_store_address, use_nonce=True)
|
||||
tx = c.set_code(tx, data)
|
||||
(tx_hash_hex, o) = c.finalize(tx)
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
class TestFaucetPeriod(TestFaucetPeriodBase):
|
||||
|
||||
def test_period_basic(self):
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
@@ -155,51 +89,23 @@ class TestFaucetPeriod(EthTesterCase):
|
||||
|
||||
|
||||
def test_balance(self):
|
||||
o = balance(self.accounts[2])
|
||||
o = balance(self.accounts[1])
|
||||
r = self.conn.do(o)
|
||||
prebalance = int(r, 16)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
enc = ABIContractEncoder()
|
||||
enc.method('setBalanceThreshold')
|
||||
enc.typ(ABIContractType.UINT256)
|
||||
enc.uint256(prebalance + 1)
|
||||
data = enc.get()
|
||||
tx = c.template(self.accounts[0], self.period_store_address, use_nonce=True)
|
||||
tx = c.set_code(tx, data)
|
||||
(tx_hash_hex, o) = c.finalize(tx)
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[2], self.conn)
|
||||
self.set_threshold(prebalance / 2)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[1], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.gimme(self.address, self.accounts[2])
|
||||
(tx_hash_hex, o) = c.gimme(self.address, self.accounts[1])
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 0)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
enc = ABIContractEncoder()
|
||||
enc.method('setBalanceThreshold')
|
||||
enc.typ(ABIContractType.UINT256)
|
||||
enc.uint256(1)
|
||||
data = enc.get()
|
||||
tx = c.template(self.accounts[0], self.period_store_address, use_nonce=True)
|
||||
tx = c.set_code(tx, data)
|
||||
(tx_hash_hex, o) = c.finalize(tx)
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
self.set_threshold(prebalance)
|
||||
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[2], self.conn)
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.gimme(self.address, self.accounts[2])
|
||||
(tx_hash_hex, o) = c.gimme(self.address, self.accounts[1])
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
|
||||
@@ -20,55 +20,13 @@ from eth_accounts_index.registry import AccountRegistry
|
||||
|
||||
# local imports
|
||||
from eth_faucet import EthFaucet
|
||||
from eth_faucet.unittest import TestFaucetRegistryBase
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
logg = logging.getLogger()
|
||||
|
||||
|
||||
class TestFaucetRegistry(EthTesterCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestFaucetRegistry, self).setUp()
|
||||
# DRY
|
||||
self.conn = RPCConnection.connect(self.chain_spec, 'default')
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
|
||||
c = AccountRegistry(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash, o) = c.constructor(self.accounts[0])
|
||||
self.conn = RPCConnection.connect(self.chain_spec, 'default')
|
||||
r = self.conn.do(o)
|
||||
|
||||
o = receipt(r)
|
||||
r = self.conn.do(o)
|
||||
self.registry_address = to_checksum_address(r['contract_address'])
|
||||
|
||||
(tx_hash_hex, o) = c.add_writer(self.registry_address, self.accounts[0], self.accounts[0])
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
(tx_hash_hex, o) = c.add(self.registry_address, self.accounts[0], self.accounts[1])
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
|
||||
(tx_hash_hex, o) = c.constructor(self.accounts[0])
|
||||
r = self.conn.do(o)
|
||||
|
||||
o = receipt(r)
|
||||
r = self.conn.do(o)
|
||||
self.address = to_checksum_address(r['contract_address'])
|
||||
logg.debug('faucet contract {}'.format(self.address))
|
||||
|
||||
(tx_hash_hex, o) = c.set_registry(self.address, self.accounts[0], self.registry_address)
|
||||
self.conn.do(o)
|
||||
o = receipt(tx_hash_hex)
|
||||
r = self.conn.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
class TestFaucetRegistry(TestFaucetRegistryBase):
|
||||
|
||||
def test_basic(self):
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
|
||||
|
||||
Reference in New Issue
Block a user