Skip to content

Commit

Permalink
style(tests): clean-up git merge artifact from docstring
Browse files Browse the repository at this point in the history
  • Loading branch information
danceratopz committed Jan 15, 2025
1 parent 3f0a476 commit adf8f06
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions tests/prague/eip2537_bls_12_381_precompiles/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,7 @@ def msm_discount(group: BLS12Group, k: int) -> int:
def msm_gas_func_gen(
group: BLS12Group, len_per_pair: int, multiplication_cost: int
) -> Callable[[int], int]:
"""
<<<<<<< HEAD
Generate a function that calculates the gas cost for the G1MSM and G2MSM precompiles.
=======
Generate function that calculates the gas cost for the G1MSM and G2MSM
precompiles.
>>>>>>> 4e264c33c6 (chore(ruff): changes to `tests/prague`.)
"""
"""Generate a function that calculates the gas cost for the G1MSM and G2MSM precompiles."""

def msm_gas(input_length: int) -> int:
"""Calculate gas cost for the G1MSM and G2MSM precompiles."""
Expand Down

0 comments on commit adf8f06

Please sign in to comment.