From fd27d938986ed79017c62f9ddb842f147c56234e Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 13 Jan 2022 11:20:30 -0800 Subject: [PATCH 1/3] add `pylint` to catch unused args --- Makefile | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca0096fb9e..ec3302e27b 100644 --- a/Makefile +++ b/Makefile @@ -130,9 +130,11 @@ codespell: codespell . --skip ./.git -I .codespell-whitelist # TODO: add future protocol upgrade patch packages to linting. +# NOTE: we use `pylint` just for catching unused arguments in spec code lint: pyspec . venv/bin/activate; cd $(PY_SPEC_DIR); \ flake8 --config $(LINTER_CONFIG_FILE) ./eth2spec \ + && pylint --disable=all --enable unused-argument ./eth2spec/phase0 ./eth2spec/altair ./eth2spec/bellatrix \ && mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.altair -p eth2spec.bellatrix lint_generators: pyspec diff --git a/setup.py b/setup.py index aa4157b292..625b6f5724 100644 --- a/setup.py +++ b/setup.py @@ -1008,7 +1008,7 @@ def run(self): python_requires=">=3.8, <4", extras_require={ "test": ["pytest>=4.4", "pytest-cov", "pytest-xdist"], - "lint": ["flake8==3.7.7", "mypy==0.812"], + "lint": ["flake8==3.7.7", "mypy==0.812", "pylint==2.12.2"], "generator": ["python-snappy==0.5.4"], }, install_requires=[ From 2b45496fe48fa75450ad29a05bdd48866f86528a Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 13 Jan 2022 11:31:27 -0800 Subject: [PATCH 2/3] clean up unused argument from `phase0` --- specs/altair/beacon-chain.md | 2 +- specs/phase0/beacon-chain.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specs/altair/beacon-chain.md b/specs/altair/beacon-chain.md index 2e897deb7d..a14ddb4f61 100644 --- a/specs/altair/beacon-chain.md +++ b/specs/altair/beacon-chain.md @@ -521,7 +521,7 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None: signing_root = compute_signing_root(deposit_message, domain) # Initialize validator if the deposit signature is valid if bls.Verify(pubkey, signing_root, deposit.data.signature): - state.validators.append(get_validator_from_deposit(state, deposit)) + state.validators.append(get_validator_from_deposit(deposit)) state.balances.append(amount) state.previous_epoch_participation.append(ParticipationFlags(0b0000_0000)) state.current_epoch_participation.append(ParticipationFlags(0b0000_0000)) diff --git a/specs/phase0/beacon-chain.md b/specs/phase0/beacon-chain.md index 7172307c60..618f396374 100644 --- a/specs/phase0/beacon-chain.md +++ b/specs/phase0/beacon-chain.md @@ -1832,7 +1832,7 @@ def process_attestation(state: BeaconState, attestation: Attestation) -> None: ##### Deposits ```python -def get_validator_from_deposit(state: BeaconState, deposit: Deposit) -> Validator: +def get_validator_from_deposit(deposit: Deposit) -> Validator: amount = deposit.data.amount effective_balance = min(amount - amount % EFFECTIVE_BALANCE_INCREMENT, MAX_EFFECTIVE_BALANCE) @@ -1877,7 +1877,7 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None: return # Add validator and balance entries - state.validators.append(get_validator_from_deposit(state, deposit)) + state.validators.append(get_validator_from_deposit(deposit)) state.balances.append(amount) else: # Increase balance by deposit amount From 10603b71c073c43b6aa85ff0983eca0bc315708c Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 13 Jan 2022 11:31:45 -0800 Subject: [PATCH 3/3] indicate unused argument in utility function --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 625b6f5724..f119514151 100644 --- a/setup.py +++ b/setup.py @@ -514,7 +514,7 @@ def get_pow_block(hash: Bytes32) -> Optional[PowBlock]: return PowBlock(block_hash=hash, parent_hash=Bytes32(), total_difficulty=uint256(0)) -def get_execution_state(execution_state_root: Bytes32) -> ExecutionState: +def get_execution_state(_execution_state_root: Bytes32) -> ExecutionState: pass