commit 71e94b5afb960280221678392f13eb9b74a549b2
parent 4e4c0f1203dd11e09871644d8e51f7c9f1ce89be
Author: nolash <dev@holbrook.no>
Date: Fri, 4 Jun 2021 11:48:17 +0200
Refactor pure test on chainlib
Diffstat:
2 files changed, 58 insertions(+), 75 deletions(-)
diff --git a/python/erc20_demurrage_token/token.py b/python/erc20_demurrage_token/token.py
@@ -135,6 +135,23 @@ class DemurrageToken(ERC20):
return o
+ def remainder(self, contract_address, parts, whole, sender_address=ZERO_ADDRESS):
+ o = jsonrpc_template()
+ o['method'] = 'eth_call'
+ enc = ABIContractEncoder()
+ enc.method('remainder')
+ enc.typ(ABIContractType.UINT256)
+ enc.typ(ABIContractType.UINT256)
+ enc.uint256(parts)
+ enc.uint256(whole)
+ data = add_0x(enc.get())
+ tx = self.template(sender_address, contract_address)
+ tx = self.set_code(tx, data)
+ o['params'].append(self.normalize(tx))
+ o['params'].append('latest')
+ return o
+
+
def apply_demurrage(self, contract_address, sender_address):
return self.transact_noarg('applyDemurrage', contract_address, sender_address)
@@ -155,6 +172,10 @@ class DemurrageToken(ERC20):
return abi_decode_single(ABIContractType.UINT256, v)
+ def parse_remainder(self, v):
+ return abi_decode_single(ABIContractType.UINT256, v)
+
+
def parse_to_base_amount(self, v):
return abi_decode_single(ABIContractType.UINT256, v)
diff --git a/python/tests/test_pure.py b/python/tests/test_pure.py
@@ -5,104 +5,66 @@ import json
import logging
import math
-# third-party imports
-import web3
+# external imports
+from chainlib.eth.constant import ZERO_ADDRESS
+from chainlib.eth.nonce import RPCNonceOracle
+from chainlib.eth.tx import receipt
+from chainlib.error import JSONRPCException
import eth_tester
-import eth_abi
+
+# local imports
+from erc20_demurrage_token import DemurrageToken
+
+# test imports
+from tests.base import TestDemurrageDefault
logging.basicConfig(level=logging.DEBUG)
logg = logging.getLogger()
-logging.getLogger('web3').setLevel(logging.WARNING)
-logging.getLogger('eth.vm').setLevel(logging.WARNING)
-
testdir = os.path.dirname(__file__)
-#BLOCKTIME = 5 # seconds
-TAX_LEVEL = int((10000 * 2) * (10 ** 32)) # 2%
-PERIOD = 10
-
-
-class Test(unittest.TestCase):
-
- contract = None
-
- def setUp(self):
- eth_params = eth_tester.backends.pyevm.main.get_default_genesis_params({
- 'gas_limit': 9000000,
- })
-
- f = open(os.path.join(testdir, '../../solidity/RedistributedDemurrageToken.bin'), 'r')
- self.bytecode = f.read()
- f.close()
-
- f = open(os.path.join(testdir, '../../solidity/RedistributedDemurrageToken.json'), 'r')
- self.abi = json.load(f)
- f.close()
-
-
- backend = eth_tester.PyEVMBackend(eth_params)
- self.eth_tester = eth_tester.EthereumTester(backend)
- provider = web3.Web3.EthereumTesterProvider(self.eth_tester)
- self.w3 = web3.Web3(provider)
- self.sink_address = self.w3.eth.accounts[9]
-
- c = self.w3.eth.contract(abi=self.abi, bytecode=self.bytecode)
- tx_hash = c.constructor('Foo Token', 'FOO', 6, TAX_LEVEL, PERIOD, self.sink_address).transact({'from': self.w3.eth.accounts[0]})
-
- r = self.w3.eth.getTransactionReceipt(tx_hash)
- self.contract = self.w3.eth.contract(abi=self.abi, address=r.contractAddress)
-
- self.start_block = self.w3.eth.blockNumber
-
-
- def tearDown(self):
- pass
-
-
- @unittest.skip('this function has been removed from contract')
- def test_tax_period(self):
- t = self.contract.functions.taxLevel().call()
- logg.debug('taxlevel {}'.format(t))
-
- a = self.contract.functions.toDemurrageAmount(1000000, 0).call()
- self.assertEqual(a, 1000000)
-
- a = self.contract.functions.toDemurrageAmount(1000000, 1).call()
- self.assertEqual(a, 980000)
-
- a = self.contract.functions.toDemurrageAmount(1000000, 2).call()
- self.assertEqual(a, 960400)
-
- a = self.contract.functions.toDemurrageAmount(980000, 1).call()
- self.assertEqual(a, 960400)
+class Test(TestDemurrageDefault):
def test_fractional_state(self):
- with self.assertRaises(eth_tester.exceptions.TransactionFailed):
- self.contract.functions.remainder(2, 1).call();
-
- with self.assertRaises(eth_tester.exceptions.TransactionFailed):
- remainder = self.contract.functions.remainder(0, 100001).call();
-
- remainder = self.contract.functions.remainder(1, 2).call();
+ nonce_oracle = RPCNonceOracle(self.accounts[1], self.rpc)
+ c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+
+ with self.assertRaises(JSONRPCException):
+ o = c.remainder(self.address, 2, 1, sender_address=self.accounts[0])
+ self.rpc.do(o)
+
+ with self.assertRaises(JSONRPCException):
+ o = c.remainder(self.address, 0, 100001, sender_address=self.accounts[0])
+ self.rpc.do(o)
+
+ o = c.remainder(self.address, 1, 2, sender_address=self.accounts[0])
+ r = self.rpc.do(o)
+ remainder = c.parse_remainder(r)
self.assertEqual(remainder, 0);
-
+
whole = 5000001
parts = 20000
expect = whole - (math.floor(whole/parts) * parts)
- remainder = self.contract.functions.remainder(parts, whole).call();
+ o = c.remainder(self.address, parts, whole, sender_address=self.accounts[0])
+ r = self.rpc.do(o)
+ remainder = c.parse_remainder(r)
self.assertEqual(remainder, expect)
parts = 30000
expect = whole - (math.floor(whole/parts) * parts)
- remainder = self.contract.functions.remainder(parts, whole).call();
+ o = c.remainder(self.address, parts, whole, sender_address=self.accounts[0])
+ r = self.rpc.do(o)
+ remainder = c.parse_remainder(r)
self.assertEqual(remainder, expect)
parts = 40001
expect = whole - (math.floor(whole/parts) * parts)
- remainder = self.contract.functions.remainder(parts, whole).call();
+ o = c.remainder(self.address, parts, whole, sender_address=self.accounts[0])
+ r = self.rpc.do(o)
+ remainder = c.parse_remainder(r)
self.assertEqual(remainder, expect)
+
if __name__ == '__main__':
unittest.main()
