wip

Author: shahin-hq

tests/fixtures/transactions/validator-update.json

@@ -0,0 +1,19 @@
+{
+    "data": {
+        "value": "0",
+        "senderPublicKey": "0243333347c8cbf4e3cbc7a96964181d02a2b0c854faa2fef86b4b8d92afcf473d",
+        "gasPrice": 5000000000,
+        "gasLimit": 200000,
+        "nonce": "1",
+        "data": "8f062626000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000030b0093ac8f37588e15df7cfb04d0722dc5486cec062233136d3b6a16d41946577a1f332c4c29c0601ccefac1905dbb611000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a8bb7c80d24ee79cf3f141eae774b7575466d68631834c29433036ac84eb4904b8f071167cccd5bcc9d11e7c187d6fc70b87ce6e046a750b07f6a8a5985e76bf005bb55b8c70c1cefaccd4c37c314ce69ddfd2eb4a21f8775e01da02e77590b3",
+        "to": "0x535B3D7A252fa034Ed71F0C53ec0C6F784cB64E1",
+        "validatorPublicKey": "0xb0093ac8f37588e15df7cfb04d0722dc5486cec062233136d3b6a16d41946577a1f332c4c29c0601ccefac1905dbb611",
+        "validatorProof": "0xa8bb7c80d24ee79cf3f141eae774b7575466d68631834c29433036ac84eb4904b8f071167cccd5bcc9d11e7c187d6fc70b87ce6e046a750b07f6a8a5985e76bf005bb55b8c70c1cefaccd4c37c314ce69ddfd2eb4a21f8775e01da02e77590b3",
+        "v": 0,
+        "r": "583edde415ec3f61643b5e2a18c34c4113eb67434adfc4d3633a1469a6fe3895",
+        "s": "165b3ec00a56227ab3931865a3a63e5e5dbb79e4e42985abe394f8eb74acbc58",
+        "hash": "917fb0ebbdfdeb2785db0e3d67bb68bf655a6381a529f22676a7a16e07278e1c"
+    },
+    "serialized": "f9018d0185012a05f20083030d4094535b3d7a252fa034ed71f0c53ec0c6f784cb64e180b901248f062626000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000030b0093ac8f37588e15df7cfb04d0722dc5486cec062233136d3b6a16d41946577a1f332c4c29c0601ccefac1905dbb611000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a8bb7c80d24ee79cf3f141eae774b7575466d68631834c29433036ac84eb4904b8f071167cccd5bcc9d11e7c187d6fc70b87ce6e046a750b07f6a8a5985e76bf005bb55b8c70c1cefaccd4c37c314ce69ddfd2eb4a21f8775e01da02e77590b3825c6ba0583edde415ec3f61643b5e2a18c34c4113eb67434adfc4d3633a1469a6fe3895a0165b3ec00a56227ab3931865a3a63e5e5dbb79e4e42985abe394f8eb74acbc58",
+    "validatorPassphrase": "bless organ december boring ill obvious unaware dinosaur broccoli build hamster rebuild skin airport stay entry denial agent october thought duck trouble decorate way"
+}

tests/transactions/builder/test_validator_update_builder.py

@@ -1,55 +1,58 @@
-from crypto.enums.contract_addresses import ContractAddresses
-from crypto.identity.proof_of_possession import ProofOfPossession
 from crypto.transactions.builder.validator_update_builder import ValidatorUpdateBuilder
 
 
-def test_validator_update_derives_bls_keys(passphrase, validator_passphrase):
-    builder = (
-        ValidatorUpdateBuilder
-            .new()
-            .gas_price(5000000000)
-            .gas_limit(200000)
-            .nonce('1')
-            .validator_passphrase(validator_passphrase)
-            .sign(passphrase)
-    )
-
-    bls = ProofOfPossession.from_passphrase(validator_passphrase)
-
-    assert builder.transaction.data['validatorPublicKey'] == '0x' + bls['pk']
-    assert builder.transaction.data['validatorProof']     == '0x' + bls['pop']
-    assert len(builder.transaction.data['validatorPublicKey']) == 98   # 0x + 96 hex = 48 bytes
-    assert len(builder.transaction.data['validatorProof'])     == 194  # 0x + 192 hex = 96 bytes
-
+def test_validator_update_transaction(passphrase, load_transaction_fixture):
+    fixture = load_transaction_fixture('transactions/validator-update')
 
-def test_validator_update_targets_consensus_contract(passphrase, validator_passphrase):
     builder = (
         ValidatorUpdateBuilder
             .new()
-            .validator_passphrase(validator_passphrase)
+            .gas_price(fixture['data']['gasPrice'])
+            .gas_limit(fixture['data']['gasLimit'])
+            .nonce(fixture['data']['nonce'])
+            .validator_passphrase(fixture['validatorPassphrase'])
+            .to(fixture['data']['to'])
             .sign(passphrase)
     )
 
-    assert builder.transaction.data['to'].lower() == ContractAddresses.CONSENSUS.value.lower()
-
-
-def test_validator_update_value_is_zero(passphrase, validator_passphrase):
-    builder = (
-        ValidatorUpdateBuilder
-            .new()
-            .validator_passphrase(validator_passphrase)
-            .sign(passphrase)
-    )
+    assert builder.transaction.data['gasPrice'] == int(fixture['data']['gasPrice'])
+    assert builder.transaction.data['gasLimit'] == int(fixture['data']['gasLimit'])
+    assert builder.transaction.data['nonce'] == fixture['data']['nonce']
+    assert builder.transaction.data['to'] == fixture['data']['to']
+    assert builder.transaction.data['value'] == int(fixture['data']['value'])
+    assert builder.transaction.data['validatorPublicKey'] == fixture['data']['validatorPublicKey']
+    assert builder.transaction.data['validatorProof'] == fixture['data']['validatorProof']
+    assert builder.transaction.data['v'] == fixture['data']['v']
+    assert builder.transaction.data['r'] == fixture['data']['r']
+    assert builder.transaction.data['s'] == fixture['data']['s']
+    assert builder.transaction.data['hash'] == fixture['data']['hash']
+    assert builder.transaction.serialize().hex() == fixture['serialized']
+    assert builder.verify()
 
-    assert builder.transaction.data['value'] == 0
 
+def test_validator_update_transaction_with_default_to(passphrase, load_transaction_fixture):
+    fixture = load_transaction_fixture('transactions/validator-update')
 
-def test_validator_update_verifies(passphrase, validator_passphrase):
     builder = (
         ValidatorUpdateBuilder
             .new()
-            .validator_passphrase(validator_passphrase)
+            .gas_price(fixture['data']['gasPrice'])
+            .gas_limit(fixture['data']['gasLimit'])
+            .nonce(fixture['data']['nonce'])
+            .validator_passphrase(fixture['validatorPassphrase'])
             .sign(passphrase)
     )
 
+    assert builder.transaction.data['gasPrice'] == int(fixture['data']['gasPrice'])
+    assert builder.transaction.data['gasLimit'] == int(fixture['data']['gasLimit'])
+    assert builder.transaction.data['nonce'] == fixture['data']['nonce']
+    assert builder.transaction.data['to'].lower() == fixture['data']['to'].lower()
+    assert builder.transaction.data['value'] == int(fixture['data']['value'])
+    assert builder.transaction.data['validatorPublicKey'] == fixture['data']['validatorPublicKey']
+    assert builder.transaction.data['validatorProof'] == fixture['data']['validatorProof']
+    assert builder.transaction.data['v'] == fixture['data']['v']
+    assert builder.transaction.data['r'] == fixture['data']['r']
+    assert builder.transaction.data['s'] == fixture['data']['s']
+    assert builder.transaction.data['hash'] == fixture['data']['hash']
+    assert builder.transaction.serialize().hex() == fixture['serialized']
     assert builder.verify()