Run extensions processing from core processor
This commit is contained in:
@@ -42,9 +42,6 @@ class TestCICEthBase(EthTesterCase):
|
||||
random.seed(42)
|
||||
self.initial_description = add_0x(random.randbytes(32).hex())
|
||||
self.token_address = add_0x(random.randbytes(20).hex())
|
||||
d = tempfile.mkdtemp()
|
||||
self.outputs_writer = KVWriter(d)
|
||||
self.core_processor = Processor(self.token_address, outputs_writer=self.outputs_writer)
|
||||
|
||||
addresses = self.keystore.list()
|
||||
|
||||
@@ -92,13 +89,19 @@ class TestCICEthBase(EthTesterCase):
|
||||
self.proofs = Proof(proof_dir, attachments=attach)
|
||||
self.proofs.load()
|
||||
|
||||
d = tempfile.mkdtemp()
|
||||
self.outputs_writer = KVWriter(d)
|
||||
|
||||
|
||||
class TestCICEthTokenBase(TestCICEthBase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCICEthTokenBase, self).setUp()
|
||||
|
||||
self.resources['token']['reference'] = None
|
||||
self.adapter = CICEth(self.core_processor, self.chain_spec, self.resources, self.proofs)
|
||||
self.adapter = CICEth(self.chain_spec, self.resources, self.proofs, outputs_writer=self.outputs_writer)
|
||||
self.token_name = 'FOotoken'
|
||||
self.token_symbol = 'FOO'
|
||||
self.token_precision = 8
|
||||
|
||||
self.core_processor = Processor(outputs_writer=self.outputs_writer, extensions=[self.adapter])
|
||||
|
||||
@@ -27,6 +27,7 @@ from giftable_erc20_token import GiftableToken
|
||||
|
||||
# local imports
|
||||
from cic.ext.eth import CICEth
|
||||
from cic.processor import Processor
|
||||
|
||||
# test imports
|
||||
from tests.eth.base_eth import TestCICEthTokenBase
|
||||
@@ -42,7 +43,8 @@ class TestCICEthRPC(TestCICEthTokenBase):
|
||||
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
|
||||
gas_oracle = RPCGasOracle(self.rpc)
|
||||
|
||||
self.adapter = CICEth(self.core_processor, self.chain_spec, self.resources, self.proofs, signer=self.signer, rpc=self.rpc, fee_oracle=gas_oracle)
|
||||
self.adapter = CICEth(self.chain_spec, self.resources, self.proofs, signer=self.signer, rpc=self.rpc, fee_oracle=gas_oracle)
|
||||
self.core_processor = Processor(outputs_writer=self.outputs_writer, extensions=[self.adapter])
|
||||
|
||||
|
||||
def test_rpc_process_notoken(self):
|
||||
@@ -62,10 +64,10 @@ class TestCICEthRPC(TestCICEthTokenBase):
|
||||
self.token_index_address = r['contract_address']
|
||||
logg.debug('token index deployed at {}'.format(self.token_index_address))
|
||||
|
||||
results = self.adapter.process()
|
||||
for hsh in results:
|
||||
logg.debug('hsh {}'.format(hsh))
|
||||
o = receipt(hsh)
|
||||
self.adapter.process()
|
||||
results = self.adapter.get_outputs()
|
||||
for v in results:
|
||||
o = receipt(v[1])
|
||||
r = self.rpc.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
@@ -73,14 +75,38 @@ class TestCICEthRPC(TestCICEthTokenBase):
|
||||
def test_rpc_process_withtoken(self):
|
||||
self.adapter.fee_oracle = OverrideGasOracle(limit=GiftableToken.gas(), conn=self.rpc)
|
||||
self.adapter.prepare_token(self.token_name, self.token_symbol, self.token_precision, GiftableToken.bytecode())
|
||||
results = self.adapter.process()
|
||||
for hsh in results:
|
||||
logg.debug('hsh {}'.format(hsh))
|
||||
o = receipt(hsh)
|
||||
self.adapter.process()
|
||||
|
||||
results = self.adapter.get_outputs()
|
||||
for v in results:
|
||||
o = receipt(v[1])
|
||||
r = self.rpc.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
o = receipt(results[0])
|
||||
o = receipt(results[0][1])
|
||||
r = self.rpc.do(o)
|
||||
token_contract_address = r['contract_address']
|
||||
|
||||
c = TokenUniqueSymbolIndex(self.chain_spec)
|
||||
o = c.address_of(self.token_index_address, 'FOO', sender_address=self.accounts[0])
|
||||
r = self.rpc.do(o)
|
||||
token_contract_address_lookup = c.parse_address_of(r)
|
||||
self.assertEqual(strip_0x(token_contract_address), strip_0x(token_contract_address_lookup))
|
||||
|
||||
|
||||
def test_rpc_process_top(self):
|
||||
self.adapter.fee_oracle = OverrideGasOracle(limit=GiftableToken.gas(), conn=self.rpc)
|
||||
self.adapter.prepare_token(self.token_name, self.token_symbol, self.token_precision, GiftableToken.bytecode())
|
||||
self.core_processor.process()
|
||||
|
||||
results = self.adapter.get_outputs()
|
||||
for v in results:
|
||||
logg.debug('results {}'.format(v))
|
||||
o = receipt(v[1])
|
||||
r = self.rpc.do(o)
|
||||
self.assertEqual(r['status'], 1)
|
||||
|
||||
o = receipt(results[0][1])
|
||||
r = self.rpc.do(o)
|
||||
token_contract_address = r['contract_address']
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import logging
|
||||
|
||||
# local imports
|
||||
from cic.ext.eth import CICEth
|
||||
from cic.processor import Processor
|
||||
|
||||
# tests imports
|
||||
from tests.eth.base_eth import TestCICEthBase
|
||||
@@ -16,21 +17,23 @@ class TestCICEthOffline(TestCICEthBase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCICEthOffline, self).setUp()
|
||||
self.adapter = CICEth(self.core_processor, self.chain_spec, self.resources, self.proofs)
|
||||
self.adapter = CICEth(self.chain_spec, self.resources, self.proofs)
|
||||
self.core_processor = Processor(outputs_writer=self.outputs_writer, extensions=[self.adapter])
|
||||
|
||||
|
||||
def test_offline_token_index(self):
|
||||
self.adapter.token_address = self.token_address
|
||||
v = self.adapter.process_token_index()
|
||||
self.assertEqual(self.adapter.outputs[0], v)
|
||||
self.assertEqual(self.adapter.outputs[0][:8], '4420e486')
|
||||
self.adapter.process_token_index()
|
||||
self.assertEqual(self.adapter.outputs[0][0], 'token_index')
|
||||
self.assertEqual(self.adapter.outputs[0][1][:8], '4420e486')
|
||||
|
||||
|
||||
def test_offline_address_declarator(self):
|
||||
self.adapter.token_address = self.token_address
|
||||
v = self.adapter.process_address_declarator()
|
||||
self.assertEqual(v[0][:8], 'ae47ece0')
|
||||
self.assertEqual(len(v), 3)
|
||||
self.adapter.process_address_declarator()
|
||||
self.assertEqual(self.adapter.outputs[0][0], 'address_declarator')
|
||||
self.assertEqual(self.adapter.outputs[0][1][:8], 'ae47ece0')
|
||||
self.assertEqual(len(self.adapter.outputs), 3)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ from hexathon import (
|
||||
|
||||
# local imports
|
||||
from cic.ext.eth import CICEth
|
||||
from cic.processor import Processor
|
||||
|
||||
# tests imports
|
||||
from tests.eth.base_eth import TestCICEthBase
|
||||
@@ -23,13 +24,14 @@ class TestCICEthSign(TestCICEthBase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCICEthSign, self).setUp()
|
||||
self.adapter = CICEth(self.core_processor, self.chain_spec, self.resources, self.proofs, signer=self.signer)
|
||||
self.adapter = CICEth(self.chain_spec, self.resources, self.proofs, signer=self.signer)
|
||||
self.core_processor = Processor(outputs_writer=self.outputs_writer, extensions=[self.adapter])
|
||||
|
||||
|
||||
def test_sign_token_index(self):
|
||||
self.adapter.token_address = self.token_address
|
||||
v = self.adapter.process_token_index()
|
||||
tx_raw = bytes.fromhex(strip_0x(self.adapter.outputs[0]))
|
||||
tx_raw = bytes.fromhex(strip_0x(self.adapter.outputs[0][1]))
|
||||
tx = unpack(tx_raw, self.chain_spec)
|
||||
self.assertEqual(strip_0x(tx['data'])[:8], '4420e486')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user