cicnet/cic-cli
5
1
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

Ext outputs to list

Browse Source
This commit is contained in:
nolash 2021-10-10 14:00:47 +02:00
parent 33f173f0c9
commit 5f126d8d59
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cic/data/network_template_v0.json
View File

@ -6,5 +6,9 @@
"token_index": { "token_index": {
"reference": null, "reference": null,
"key_account": null "key_account": null
},
"address_declarator": {
"reference": null,
"key_account": null
} }
} }

13
cic/ext/eth/__init__.py
View File

@ -24,9 +24,7 @@ class CICEth:
self.nonce_oracle = nonce_oracle self.nonce_oracle = nonce_oracle
self.fee_oracle = fee_oracle self.fee_oracle = fee_oracle
self.token_address = None self.token_address = None
self.outputs = {} self.outputs = []
for k in resources.keys():
self.outputs[k] = None
self.tx_format = TxFormat.RAW_ARGS self.tx_format = TxFormat.RAW_ARGS
if self.rpc != None: if self.rpc != None:
self.tx_format = TxFormat.JSONRPC self.tx_format = TxFormat.JSONRPC
@ -44,15 +42,16 @@ class CICEth:
contract_address = self.resources['token_index']['reference'] contract_address = self.resources['token_index']['reference']
signer_address = self.resources['token_index']['key_address'] signer_address = self.resources['token_index']['key_address']
o = c.register(contract_address, signer_address, self.token_address, tx_format=self.tx_format) o = c.register(contract_address, signer_address, self.token_address, tx_format=self.tx_format)
r = None
if self.rpc != None: if self.rpc != None:
r = self.rpc.do(o[1]) r = self.rpc.do(o[1])
self.outputs['token_index'] = r
elif self.signer != None: elif self.signer != None:
self.outputs['token_index'] = o[1] r = o[1]
else: else:
self.outputs['token_index'] = o r = o
return self.outputs['token_index'] self.outputs.append(r)
return r
def process(self): def process(self):

2
tests/eth/base_eth.py
View File

@ -39,5 +39,3 @@ class TestCICEthBase(EthTesterCase):
self.proofs = [] self.proofs = []
for i in range(3): for i in range(3):
self.proofs.append(random.randbytes(32).hex()) self.proofs.append(random.randbytes(32).hex())

6
tests/eth/test_eth_offline.py
View File

@ -17,8 +17,12 @@ class TestCICEthOffline(TestCICEthBase):
def test_offline_token_index(self): def test_offline_token_index(self):
self.adapter.token_address = self.token_address self.adapter.token_address = self.token_address
v = self.adapter.process_token_index() v = self.adapter.process_token_index()
self.assertEqual(self.adapter.outputs['token_index'][:8], '4420e486') self.assertEqual(self.adapter.outputs[0], v)
self.assertEqual(self.adapter.outputs[0][:8], '4420e486')
def test_offline_address_declarator(self):
pass
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

2
tests/eth/test_eth_rpc.py
View File

@ -38,7 +38,7 @@ class TestCICEthRPC(TestCICEthBase):
adapter_norpc.token_address = self.token_address adapter_norpc.token_address = self.token_address
vv = adapter_norpc.process_token_index() vv = adapter_norpc.process_token_index()
tx_raw = bytes.fromhex(strip_0x(adapter_norpc.outputs['token_index'])) tx_raw = bytes.fromhex(strip_0x(vv))
tx = unpack(tx_raw, self.chain_spec) tx = unpack(tx_raw, self.chain_spec)
self.assertEqual(strip_0x(tx['hash']), strip_0x(v)) self.assertEqual(strip_0x(tx['hash']), strip_0x(v))

2
tests/eth/test_eth_sign.py
View File

@ -29,7 +29,7 @@ class TestCICEthSign(TestCICEthBase):
def test_sign_token_index(self): def test_sign_token_index(self):
self.adapter.token_address = self.token_address self.adapter.token_address = self.token_address
v = self.adapter.process_token_index() v = self.adapter.process_token_index()
tx_raw = bytes.fromhex(strip_0x(self.adapter.outputs['token_index'])) tx_raw = bytes.fromhex(strip_0x(self.adapter.outputs[0]))
tx = unpack(tx_raw, self.chain_spec) tx = unpack(tx_raw, self.chain_spec)
self.assertEqual(strip_0x(tx['data'])[:8], '4420e486') self.assertEqual(strip_0x(tx['data'])[:8], '4420e486')