Skip to content

Commit

Permalink
Remove evm-int-simplifications.k module (#2255)
Browse files Browse the repository at this point in the history
* Remove evm-int-simplifications.k module

All rules in `evm-int-simplifications.k` are duplicated in `int-simplifications.k`
at the time of writing. Therefore the file can be deleted without losing any
simplifications, all proofs should have the simplifications available as before.

* Set Version: 1.0.415

* Set Version: 1.0.416

* Restore evm-int-simplifications.k module, remove rules from int-simplifications.k

int-simplifications should be decoupled from evm-semantics so it
cannot import any of its modules. The evm-int-simplifications.k
equations continue to be tested in separate lemmas.

This reverts commit da94a9f.

---------

Co-authored-by: devops <[email protected]>
  • Loading branch information
jberthold and devops authored Jan 15, 2024
1 parent 5a026c7 commit ba3f1ab
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 45 deletions.
2 changes: 1 addition & 1 deletion kevm-pyk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "kevm-pyk"
version = "1.0.415"
version = "1.0.416"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion kevm-pyk/src/kevm_pyk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
from typing import Final


VERSION: Final = '1.0.415'
VERSION: Final = '1.0.416'
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
requires "evm-types.md"

module INT-SIMPLIFICATION
imports INT-SIMPLIFICATION-HASKELL
endmodule
Expand Down Expand Up @@ -90,7 +88,6 @@ endmodule
module INT-SIMPLIFICATION-COMMON
imports INT
imports BOOL
imports EVM-TYPES

// ###########################################################################
// add, sub
Expand Down Expand Up @@ -204,43 +201,4 @@ module INT-SIMPLIFICATION-COMMON

rule A -Int B +Int C <=Int D => false requires D <Int A -Int B andBool 0 <=Int C [simplification]

// ###########################################################################
// up/Int
// ###########################################################################

rule [upInt-lt-true]:
((X up/Int Y) *Int Y) <Int Z => true
requires X +Int Y <=Int Z andBool 0 <Int Y
[simplification]

rule [upInt-lt-false]:
((X up/Int Y) *Int Y) <Int Z => false
requires Z <=Int X andBool 0 <Int Y
[simplification]

rule [upInt-refl-leq]:
((X up/Int Y) *Int Y) <=Int X => X modInt Y ==Int 0
requires 0 <Int Y
[simplification]

rule [upInt-refl-gt]:
X <Int ((X up/Int Y) *Int Y) => X modInt Y =/=Int 0
requires 0 <Int Y
[simplification]

rule [upInt-refl-geq]:
X <=Int ((X up/Int Y) *Int Y) => true
requires 0 <Int Y
[simplification]

rule [upInt-ref-eq]:
X ==Int ((X up/Int Y) *Int Y) => X modInt Y ==Int 0
requires 0 <Int Y
[simplification, comm]

rule [upInt-refl-neq]:
X =/=Int ((X up/Int Y) *Int Y) => X modInt Y =/=Int 0
requires 0 <Int Y
[simplification, comm]

endmodule
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.415
1.0.416

0 comments on commit ba3f1ab

Please sign in to comment.