From 61ba308e13f64f6707b679f963c9d92027b9c8c4 Mon Sep 17 00:00:00 2001 From: tersec Date: Thu, 14 Apr 2022 15:39:37 +0000 Subject: [PATCH] stylecheck fixes (#3593) --- beacon_chain/consensus_object_pools/block_clearance.nim | 6 +++--- beacon_chain/consensus_object_pools/spec_cache.nim | 2 +- beacon_chain/spec/beaconstate.nim | 4 ++-- beacon_chain/spec/state_transition.nim | 2 +- beacon_chain/spec/state_transition_block.nim | 4 ++-- research/block_sim.nim | 2 +- tests/test_attestation_pool.nim | 2 +- tests/test_interop.nim | 2 +- tests/test_keystore_management.nim | 9 ++++++++- tests/testblockutil.nim | 4 ++-- 10 files changed, 22 insertions(+), 15 deletions(-) diff --git a/beacon_chain/consensus_object_pools/block_clearance.nim b/beacon_chain/consensus_object_pools/block_clearance.nim index 0fbf21819..e0bf9efae 100644 --- a/beacon_chain/consensus_object_pools/block_clearance.nim +++ b/beacon_chain/consensus_object_pools/block_clearance.nim @@ -142,7 +142,7 @@ proc addHeadBlock*( ## Try adding a block to the chain, verifying first that it passes the state ## transition function and contains correct cryptographic signature. ## - ## Cryptographic checks can be skipped by adding skipBLSValidation to + ## Cryptographic checks can be skipped by adding skipBlsValidation to ## dag.updateFlags logScope: blockRoot = shortLog(signedBlock.root) @@ -230,8 +230,8 @@ proc addHeadBlock*( let stateDataTick = Moment.now() # First, batch-verify all signatures in block - if skipBLSValidation notin dag.updateFlags: - # TODO: remove skipBLSValidation + if skipBlsValidation notin dag.updateFlags: + # TODO: remove skipBlsValidation var sigs: seq[SignatureSet] if (let e = sigs.collectSignatureSets( signedBlock, dag.db.immutableValidators, diff --git a/beacon_chain/consensus_object_pools/spec_cache.nim b/beacon_chain/consensus_object_pools/spec_cache.nim index c82053174..8563b101a 100644 --- a/beacon_chain/consensus_object_pools/spec_cache.nim +++ b/beacon_chain/consensus_object_pools/spec_cache.nim @@ -128,7 +128,7 @@ proc is_valid_indexed_attestation*( return err("is_valid_indexed_attestation: no attesting indices") # Verify aggregate signature - if not (skipBLSValidation in flags or attestation.signature is TrustedSig): + if not (skipBlsValidation in flags or attestation.signature is TrustedSig): var pubkeys = newSeqOfCap[CookedPubKey](sigs) for index in get_attesting_indices( diff --git a/beacon_chain/spec/beaconstate.nim b/beacon_chain/spec/beaconstate.nim index 583aee1d3..4c87646a7 100644 --- a/beacon_chain/spec/beaconstate.nim +++ b/beacon_chain/spec/beaconstate.nim @@ -424,7 +424,7 @@ proc is_valid_indexed_attestation*( return err("indexed attestation: indices not sorted and unique") # Verify aggregate signature - if not (skipBLSValidation in flags or indexed_attestation.signature is TrustedSig): + if not (skipBlsValidation in flags or indexed_attestation.signature is TrustedSig): let pubkeys = mapIt( indexed_attestation.attesting_indices, state.validators[it].pubkey) if not verify_attestation_signature( @@ -483,7 +483,7 @@ proc is_valid_indexed_attestation*( return err("is_valid_indexed_attestation: no attesting indices") # Verify aggregate signature - if not (skipBLSValidation in flags or attestation.signature is TrustedSig): + if not (skipBlsValidation in flags or attestation.signature is TrustedSig): var pubkeys = newSeqOfCap[ValidatorPubKey](sigs) for index in get_attesting_indices( diff --git a/beacon_chain/spec/state_transition.nim b/beacon_chain/spec/state_transition.nim index 870e21acf..ff85713fe 100644 --- a/beacon_chain/spec/state_transition.nim +++ b/beacon_chain/spec/state_transition.nim @@ -214,7 +214,7 @@ proc state_transition_block_aux( # by the block proposer. Every actor in the network will update its state # according to the contents of this block - but first they will validate # that the block is sane. - if skipBLSValidation notin flags: + if skipBlsValidation notin flags: ? verify_block_signature(state.data, signedBlock) trace "state_transition: processing block, signature passed", diff --git a/beacon_chain/spec/state_transition_block.nim b/beacon_chain/spec/state_transition_block.nim index 4eaff9fb1..e3a333fa8 100644 --- a/beacon_chain/spec/state_transition_block.nim +++ b/beacon_chain/spec/state_transition_block.nim @@ -85,7 +85,7 @@ proc process_randao( let epoch = state.get_current_epoch() - if skipBLSValidation notin flags: + if skipBlsValidation notin flags: let proposer_pubkey = state.validators.asSeq()[proposer_index.get].pubkey if not verify_epoch_signature( @@ -296,7 +296,7 @@ proc process_deposit*(cfg: RuntimeConfig, else: # Verify the deposit signature (proof of possession) which is not checked # by the deposit contract - if skipBLSValidation in flags or verify_deposit_signature(cfg, deposit.data): + if skipBlsValidation in flags or verify_deposit_signature(cfg, deposit.data): # New validator! Add validator and balance entries if not state.validators.add(get_validator_from_deposit(deposit.data)): return err("process_deposit: too many validators") diff --git a/research/block_sim.nim b/research/block_sim.nim index d3c911fa6..3377d2516 100644 --- a/research/block_sim.nim +++ b/research/block_sim.nim @@ -390,7 +390,7 @@ cli do(slots = SLOTS_PER_EPOCH * 6, let newDeposits = int clamp(gauss(r, 5.0, 8.0), 0.0, 1000.0) for i in 0 ..< newDeposits: let validatorIdx = merkleizer.getChunkCount.int - let d = makeDeposit(validatorIdx, {skipBLSValidation}) + let d = makeDeposit(validatorIdx, {skipBlsValidation}) eth1Block.deposits.add d merkleizer.addChunk hash_tree_root(d).data diff --git a/tests/test_attestation_pool.nim b/tests/test_attestation_pool.nim index f106fd4ff..6a981e245 100644 --- a/tests/test_attestation_pool.nim +++ b/tests/test_attestation_pool.nim @@ -532,7 +532,7 @@ suite "Attestation pool processing" & preset(): test "Trying to add a duplicate block from an old pruned epoch is tagged as an error": # Note: very sensitive to stack usage - dag.updateFlags.incl {skipBLSValidation} + dag.updateFlags.incl {skipBlsValidation} var cache = StateCache() let b10 = addTestBlock(state[], cache).phase0Data diff --git a/tests/test_interop.nim b/tests/test_interop.nim index a3f256f4b..86d0a44b5 100644 --- a/tests/test_interop.nim +++ b/tests/test_interop.nim @@ -136,7 +136,7 @@ suite "Interop": test "Interop signatures": for dep in depositsConfig: - let computed_sig = bls_sign( + let computed_sig = blsSign( privkey = dep.privkey, message = dep.signing_root ) diff --git a/tests/test_keystore_management.nim b/tests/test_keystore_management.nim index 8cabb070b..ae51946f4 100644 --- a/tests/test_keystore_management.nim +++ b/tests/test_keystore_management.nim @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + {.used.} import @@ -40,7 +47,7 @@ proc contentEquals(filePath, expectedContent: string): bool = let rng = keys.newRng() mnemonic = generateMnemonic(rng[]) - seed = getSeed(mnemonic, KeyStorePass.init "") + seed = getSeed(mnemonic, KeystorePass.init "") cfg = defaultRuntimeConfig validatorDirRes = secureCreatePath(testValidatorsDir) diff --git a/tests/testblockutil.nim b/tests/testblockutil.nim index dcc0419cd..f14d1e4ca 100644 --- a/tests/testblockutil.nim +++ b/tests/testblockutil.nim @@ -53,7 +53,7 @@ func makeDeposit*( withdrawal_credentials: withdrawal_credentials, amount: MAX_EFFECTIVE_BALANCE) - if skipBLSValidation notin flags: + if skipBlsValidation notin flags: result.signature = get_deposit_signature(cfg, result, privkey).toValidatorSig() func makeInitialDeposits*( @@ -234,7 +234,7 @@ func makeAttestation*( var aggregation_bits = CommitteeValidatorsBits.init(committee.len) aggregation_bits.setBit sac_index - let sig = if skipBLSValidation in flags: + let sig = if skipBlsValidation in flags: ValidatorSig() else: makeAttestationSig(