Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable legacy backend integration tests #269

Closed
wants to merge 21 commits into from
Closed

Disable legacy backend integration tests #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cb61b60
Remove no-booster specific logic from tests
nwatson22 Jan 12, 2024
1bc00e3
Set Version: 0.1.110
Jan 12, 2024
4150984
Fix references to IntTypeTest.test_uint
nwatson22 Jan 12, 2024
9fc89bf
Update expected files to be in line with booster version
nwatson22 Jan 17, 2024
235b947
Set Version: 0.1.119
Jan 17, 2024
fdbaddc
Merge remote-tracking branch 'origin/master' into noah/disable-legacy…
nwatson22 Jan 17, 2024
3cb184d
Update
nwatson22 Jan 17, 2024
9c62dd4
fix test_foundry_prove
nwatson22 Jan 17, 2024
1411db8
Update expected output
nwatson22 Jan 18, 2024
09e45bd
Set Version: 0.1.120
Jan 18, 2024
1f696ce
Merge master into branch
nwatson22 Jan 18, 2024
7016c36
Remove renamed test test data, add beginning of catalogue of test suite
nwatson22 Jan 18, 2024
89f03d2
Update foundry list output
nwatson22 Jan 18, 2024
d0da08c
Merge branch 'master' into noah/disable-legacy-tests
nwatson22 Jan 18, 2024
8db7d92
Set Version: 0.1.121
Jan 18, 2024
5ec8ad7
Remove legacy backend integration tests from workflow
nwatson22 Jan 19, 2024
3656503
Merge branch 'noah/disable-legacy-tests' of https://github.com/runtim…
nwatson22 Jan 19, 2024
7db9aee
Merge branch 'master' into noah/disable-legacy-tests
nwatson22 Jan 20, 2024
b6e37e0
Set Version: 0.1.122
Jan 20, 2024
dd8bfaf
Merge master into branch
nwatson22 Jan 22, 2024
77d7f56
Set Version: 0.1.125
Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
strategy:
fail-fast: false
matrix:
backend: ['legacy', 'booster']
backend: ['booster']
timeout-minutes: 180
steps:
- name: 'Check out code'
Expand Down
2 changes: 1 addition & 1 deletion package/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.124
0.1.125
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
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 = "kontrol"
version = "0.1.124"
version = "0.1.125"
description = "Foundry integration for KEVM"
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion src/kontrol/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
if TYPE_CHECKING:
from typing import Final

VERSION: Final = '0.1.124'
VERSION: Final = '0.1.125'
12 changes: 2 additions & 10 deletions src/tests/integration/test-data/contracts.k.expected
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions src/tests/integration/test-data/foundry-prove-all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,14 @@ UintTypeTest.test_uint88_fail(uint88)
UintTypeTest.test_uint8_fail(uint8)
UintTypeTest.test_uint96(uint96)
UintTypeTest.test_uint96_fail(uint96)
IntTypeTest.testFail_uint128(uint128)
IntTypeTest.testFail_uint256(uint256)
IntTypeTest.testFail_uint64(uint64)
IntTypeTest.test_uint128(uint128)
IntTypeTest.test_uint128_fail(uint128)
IntTypeTest.test_uint256(uint256)
IntTypeTest.test_uint256_fail(uint256)
IntTypeTest.test_uint64(uint64)
IntTypeTest.test_uint64_fail(uint64)
IntTypeTest.testFail_int128(uint128)
IntTypeTest.testFail_int256(uint256)
IntTypeTest.testFail_int64(uint64)
IntTypeTest.test_int128(uint128)
IntTypeTest.test_int128_fail(uint128)
IntTypeTest.test_int256(uint256)
IntTypeTest.test_int256_fail(uint256)
IntTypeTest.test_int64(uint64)
IntTypeTest.test_int64_fail(uint64)
StructTypeTest.test_vars((uint8,uint32,bytes32))
WarpTest.test_warp_setup()
96 changes: 48 additions & 48 deletions src/tests/integration/test-data/foundry-prove-skip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ AllowChangesTest.testAllow_fail()
ArithmeticTest.test_decreasing_div(uint256,uint256)
ArithmeticTest.test_max1_broken(uint256,uint256)
ArithmeticTest.test_wdiv_rounding(uint256,uint256)
ArithmeticTest.test_wmul_increasing(uint256,uint256)
ArithmeticTest.test_wmul_increasing_gt_one(uint256,uint256)
ArithmeticTest.test_wmul_increasing_overflow(uint256,uint256)
ArithmeticTest.test_wmul_increasing_positive(uint256,uint256)
ArithmeticTest.test_wmul_increasing(uint256,uint256)
ArithmeticTest.test_wmul_rounding(uint256,uint256)
ArithmeticTest.test_wmul_wdiv_inverse(uint256,uint256)
ArithmeticTest.test_wmul_wdiv_inverse_underflow(uint256,uint256)
Expand Down Expand Up @@ -71,20 +71,29 @@ ForkTest.testRPCUrl()
ForkTest.testRPCUrlRevert()
GasTest.testInfiniteGas()
GetCodeTest.testGetCode()
IntTypeTest.testFail_int128(uint128)
IntTypeTest.testFail_int256(uint256)
IntTypeTest.testFail_int64(uint64)
IntTypeTest.test_int128_fail(uint128)
IntTypeTest.test_int128(uint128)
IntTypeTest.test_int256_fail(uint256)
IntTypeTest.test_int256(uint256)
IntTypeTest.test_int64_fail(uint64)
IntTypeTest.test_int64(uint64)
LoopsTest.testIsNotPrime(uint256)
LoopsTest.testIsPrime(uint256,uint256)
LoopsTest.testIsPrimeBroken(uint256,uint256)
LoopsTest.testIsPrimeOpt(uint256)
LoopsTest.testMax(uint256[])
LoopsTest.testIsPrime(uint256,uint256)
LoopsTest.testMaxBroken(uint256[])
LoopsTest.testMax(uint256[])
LoopsTest.testNthPrime(uint256,uint256)
LoopsTest.testSort(uint256[])
LoopsTest.testSortBroken(uint256[])
LoopsTest.testSort(uint256[])
LoopsTest.testSqrt(uint256)
LoopsTest.test_sum_100()
LoopsTest.test_sum_1000()
LoopsTest.testSumToN(uint256)
LoopsTest.testSumToNBroken(uint256)
LoopsTest.testSumToN(uint256)
MockCallTest.testMockCall()
MockCallTest.testMockCalls()
MockCallTest.testMockCallValue()
Expand Down Expand Up @@ -122,9 +131,9 @@ UintTypeTest.testFail_uint128(uint128)
UintTypeTest.testFail_uint136(uint136)
UintTypeTest.testFail_uint144(uint144)
UintTypeTest.testFail_uint152(uint152)
UintTypeTest.testFail_uint16(uint16)
UintTypeTest.testFail_uint160(uint160)
UintTypeTest.testFail_uint168(uint168)
UintTypeTest.testFail_uint16(uint16)
UintTypeTest.testFail_uint176(uint176)
UintTypeTest.testFail_uint184(uint184)
UintTypeTest.testFail_uint192(uint192)
Expand All @@ -133,89 +142,80 @@ UintTypeTest.testFail_uint208(uint208)
UintTypeTest.testFail_uint216(uint216)
UintTypeTest.testFail_uint224(uint224)
UintTypeTest.testFail_uint232(uint232)
UintTypeTest.testFail_uint24(uint24)
UintTypeTest.testFail_uint240(uint240)
UintTypeTest.testFail_uint248(uint248)
UintTypeTest.testFail_uint24(uint24)
UintTypeTest.testFail_uint256(uint256)
UintTypeTest.testFail_uint32(uint32)
UintTypeTest.testFail_uint40(uint40)
UintTypeTest.testFail_uint48(uint48)
UintTypeTest.testFail_uint56(uint56)
UintTypeTest.testFail_uint64(uint64)
UintTypeTest.testFail_uint72(uint72)
UintTypeTest.testFail_uint8(uint8)
UintTypeTest.testFail_uint80(uint80)
UintTypeTest.testFail_uint88(uint88)
UintTypeTest.testFail_uint8(uint8)
UintTypeTest.testFail_uint96(uint96)
UintTypeTest.test_uint104(uint104)
UintTypeTest.test_uint104_fail(uint104)
UintTypeTest.test_uint112(uint112)
UintTypeTest.test_uint104(uint104)
UintTypeTest.test_uint112_fail(uint112)
UintTypeTest.test_uint120(uint120)
UintTypeTest.test_uint112(uint112)
UintTypeTest.test_uint120_fail(uint120)
UintTypeTest.test_uint128(uint128)
UintTypeTest.test_uint120(uint120)
UintTypeTest.test_uint128_fail(uint128)
UintTypeTest.test_uint136(uint136)
UintTypeTest.test_uint128(uint128)
UintTypeTest.test_uint136_fail(uint136)
UintTypeTest.test_uint144(uint144)
UintTypeTest.test_uint136(uint136)
UintTypeTest.test_uint144_fail(uint144)
UintTypeTest.test_uint152(uint152)
UintTypeTest.test_uint144(uint144)
UintTypeTest.test_uint152_fail(uint152)
UintTypeTest.test_uint16(uint16)
UintTypeTest.test_uint160(uint160)
UintTypeTest.test_uint152(uint152)
UintTypeTest.test_uint160_fail(uint160)
UintTypeTest.test_uint168(uint168)
UintTypeTest.test_uint160(uint160)
UintTypeTest.test_uint168_fail(uint168)
UintTypeTest.test_uint168(uint168)
UintTypeTest.test_uint16_fail(uint16)
UintTypeTest.test_uint176(uint176)
UintTypeTest.test_uint16(uint16)
UintTypeTest.test_uint176_fail(uint176)
UintTypeTest.test_uint184(uint184)
UintTypeTest.test_uint176(uint176)
UintTypeTest.test_uint184_fail(uint184)
UintTypeTest.test_uint192(uint192)
UintTypeTest.test_uint184(uint184)
UintTypeTest.test_uint192_fail(uint192)
UintTypeTest.test_uint200(uint200)
UintTypeTest.test_uint192(uint192)
UintTypeTest.test_uint200_fail(uint200)
UintTypeTest.test_uint208(uint208)
UintTypeTest.test_uint200(uint200)
UintTypeTest.test_uint208_fail(uint208)
UintTypeTest.test_uint216(uint216)
UintTypeTest.test_uint208(uint208)
UintTypeTest.test_uint216_fail(uint216)
UintTypeTest.test_uint224(uint224)
UintTypeTest.test_uint216(uint216)
UintTypeTest.test_uint224_fail(uint224)
UintTypeTest.test_uint232(uint232)
UintTypeTest.test_uint224(uint224)
UintTypeTest.test_uint232_fail(uint232)
UintTypeTest.test_uint24(uint24)
UintTypeTest.test_uint240(uint240)
UintTypeTest.test_uint232(uint232)
UintTypeTest.test_uint240_fail(uint240)
UintTypeTest.test_uint248(uint248)
UintTypeTest.test_uint240(uint240)
UintTypeTest.test_uint248_fail(uint248)
UintTypeTest.test_uint248(uint248)
UintTypeTest.test_uint24_fail(uint24)
UintTypeTest.test_uint24(uint24)
UintTypeTest.test_uint256_fail(uint256)
UintTypeTest.test_uint32(uint32)
UintTypeTest.test_uint32_fail(uint32)
UintTypeTest.test_uint40(uint40)
UintTypeTest.test_uint32(uint32)
UintTypeTest.test_uint40_fail(uint40)
UintTypeTest.test_uint48(uint48)
UintTypeTest.test_uint40(uint40)
UintTypeTest.test_uint48_fail(uint48)
UintTypeTest.test_uint56(uint56)
UintTypeTest.test_uint48(uint48)
UintTypeTest.test_uint56_fail(uint56)
UintTypeTest.test_uint64(uint64)
UintTypeTest.test_uint56(uint56)
UintTypeTest.test_uint64_fail(uint64)
UintTypeTest.test_uint72(uint72)
UintTypeTest.test_uint64(uint64)
UintTypeTest.test_uint72_fail(uint72)
UintTypeTest.test_uint8(uint8)
UintTypeTest.test_uint80(uint80)
UintTypeTest.test_uint72(uint72)
UintTypeTest.test_uint80_fail(uint80)
UintTypeTest.test_uint88(uint88)
UintTypeTest.test_uint80(uint80)
UintTypeTest.test_uint88_fail(uint88)
UintTypeTest.test_uint88(uint88)
UintTypeTest.test_uint8_fail(uint8)
UintTypeTest.test_uint96(uint96)
UintTypeTest.test_uint8(uint8)
UintTypeTest.test_uint96_fail(uint96)
IntTypeTest.testFail_uint128(uint128)
IntTypeTest.testFail_uint256(uint256)
IntTypeTest.testFail_uint64(uint64)
IntTypeTest.test_uint128(uint128)
IntTypeTest.test_uint128_fail(uint128)
IntTypeTest.test_uint256(uint256)
IntTypeTest.test_uint256_fail(uint256)
IntTypeTest.test_uint64(uint64)
IntTypeTest.test_uint64_fail(uint64)
UintTypeTest.test_uint96(uint96)
18 changes: 9 additions & 9 deletions src/tests/integration/test-data/foundry-prove-skip-legacy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ ForkTest.testRPCUrlRevert()
GasTest.testInfiniteGas()
GetCodeTest.testGetCode()
InitCodeTest.test_init()
IntTypeTest.testFail_uint128(uint128)
IntTypeTest.testFail_uint256(uint256)
IntTypeTest.testFail_uint64(uint64)
IntTypeTest.test_uint128_fail(uint128)
IntTypeTest.test_uint128(uint128)
IntTypeTest.test_uint256_fail(uint256)
IntTypeTest.test_uint256(uint256)
IntTypeTest.test_uint64_fail(uint64)
IntTypeTest.test_uint64(uint64)
IntTypeTest.testFail_int128(uint128)
IntTypeTest.testFail_int256(uint256)
IntTypeTest.testFail_int64(uint64)
IntTypeTest.test_int128_fail(uint128)
IntTypeTest.test_int128(uint128)
IntTypeTest.test_int256_fail(uint256)
IntTypeTest.test_int256(uint256)
IntTypeTest.test_int64_fail(uint64)
IntTypeTest.test_int64(uint64)
LoopsTest.sum_N(uint256)
LoopsTest.testIsNotPrime(uint256)
LoopsTest.testIsPrimeBroken(uint256,uint256)
Expand Down
9 changes: 0 additions & 9 deletions src/tests/integration/test-data/foundry/test/AllowChangesTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,4 @@ contract AllowChangesTest is Test, KEVMCheats {
canChange.changeValue2(23452);
}

function testAllow_fail() public {
ValueStore canChange = new ValueStore();
ValueStore cannotChange = new ValueStore();

kevm.allowCallsToAddress(address(canChange));
kevm.allowChangesToStorage(address(canChange), 0);

canChange.changeValue2(234521);
}
}
13 changes: 4 additions & 9 deletions src/tests/integration/test-data/gas-abstraction.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,7 @@ Node 6:
#And ( { true #Equals 0 <=Int NUMBER_CELL:Int }
#And ( { true #Equals CALLER_ID:Int <Int pow160 }
#And ( { true #Equals ORIGIN_ID:Int <Int pow160 }
#And ( { true #Equals NUMBER_CELL:Int <=Int maxSInt256 }
#And { true #Equals ( VGAS:Int +Int -298 ) <Int ( VGAS:Int +Int -207 ) } ) ) ) ) ) ) )
#And { true #Equals NUMBER_CELL:Int <=Int maxSInt256 } ) ) ) ) ) )



Expand Down Expand Up @@ -603,7 +602,6 @@ Node 6:
andBool ( ORIGIN_ID:Int <Int pow160
andBool ( NUMBER_CELL:Int <=Int maxSInt256
))))))
ensures ( VGAS:Int +Int -298 ) <Int ( VGAS:Int +Int -207 )
[label(BASIC-BLOCK-1-TO-3)]

rule [BASIC-BLOCK-4-TO-5]: <foundry>
Expand Down Expand Up @@ -814,8 +812,7 @@ Node 6:
andBool ( CALLER_ID:Int <Int pow160
andBool ( ORIGIN_ID:Int <Int pow160
andBool ( NUMBER_CELL:Int <=Int maxSInt256
andBool ( ( VGAS:Int +Int -298 ) <Int ( VGAS:Int +Int -207 )
)))))))
))))))
[label(BASIC-BLOCK-4-TO-5)]

rule [BASIC-BLOCK-5-TO-6]: <foundry>
Expand Down Expand Up @@ -1026,8 +1023,7 @@ Node 6:
andBool ( CALLER_ID:Int <Int pow160
andBool ( ORIGIN_ID:Int <Int pow160
andBool ( NUMBER_CELL:Int <=Int maxSInt256
andBool ( ( VGAS:Int +Int -298 ) <Int ( VGAS:Int +Int -207 )
)))))))
))))))
[label(BASIC-BLOCK-5-TO-6)]

endmodule
Expand All @@ -1043,8 +1039,7 @@ Failing nodes:
#And ( { true #Equals 0 <=Int NUMBER_CELL:Int }
#And ( { true #Equals CALLER_ID:Int <Int pow160 }
#And ( { true #Equals ORIGIN_ID:Int <Int pow160 }
#And ( { true #Equals NUMBER_CELL:Int <=Int maxSInt256 }
#And { true #Equals ( VGAS:Int +Int -298 ) <Int ( VGAS:Int +Int -207 ) } ) ) ) ) ) ) #Implies { true #Equals foundry_success ( ... statusCode: EVMC_REVERT , failed: #lookup ( .Map , 46308022326495007027972728677917914892729792999299745830475596687180801507328 ) , revertExpected: false , opcodeExpected: false , recordEventExpected: false , eventExpected: false ) } )
#And { true #Equals NUMBER_CELL:Int <=Int maxSInt256 } ) ) ) ) ) #Implies { true #Equals foundry_success ( ... statusCode: EVMC_REVERT , failed: #lookup ( .Map , 46308022326495007027972728677917914892729792999299745830475596687180801507328 ) , revertExpected: false , opcodeExpected: false , recordEventExpected: false , eventExpected: false ) } )
Path condition:
#Top

Expand Down
Loading