AtHeartEngineer/rln-contract
1
0
Fork 0
mirror of https://github.com/vacp2p/rln-contract.git synced 2026-01-07 22:04:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: make tests compile with forge-std@1.6.0

Browse Source 
There was a breaking change introduced in `forge-std` at
https://github.com/foundry-rs/forge-std/pull/407 which breaks
compilation of `Rln.t.sol` with `forge-std@v1.6.0`.

This commit updates the dependency to v1.6.0 and adjusts the test source
such that it successfully compiles.

Another way to go about this would've been to just stick with `v1.5.6.`
and ensuring installation of that version.
However, I've decided to update the dependency to the latest stable
version instead.
This commit is contained in:
r4bbit
2023-08-08 19:13:19 +02:00
parent a092b934a6
commit e13af692f7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,4 +1,4 @@
[submodule "lib/forge-std"] [submodule "lib/forge-std"]
path = lib/forge-std path = lib/forge-std
url = https://github.com/foundry-rs/forge-std url = https://github.com/foundry-rs/forge-std
branch = v1.5.2 branch = v1.6.0

2
lib/forge-std

Submodule lib/forge-std updated: 2b58ecbcf3...74cfb77e30

6
test/Rln.t.sol
View File

@@ -77,7 +77,7 @@ contract RlnTest is Test {
// avoid precompiles, etc // avoid precompiles, etc
// TODO: wrap both of these in a single function // TODO: wrap both of these in a single function
assumePayable(to); assumePayable(to);
assumeNoPrecompiles(to); assumeNotPrecompile(to);
vm.assume(to != address(0)); vm.assume(to != address(0));
rln.register{value: MEMBERSHIP_DEPOSIT}(idCommitment); rln.register{value: MEMBERSHIP_DEPOSIT}(idCommitment);
@@ -118,7 +118,7 @@ contract RlnTest is Test {
function test__InvalidSlash__NoStake(uint256 idCommitment, address payable to) public { function test__InvalidSlash__NoStake(uint256 idCommitment, address payable to) public {
// avoid precompiles, etc // avoid precompiles, etc
assumePayable(to); assumePayable(to);
assumeNoPrecompiles(to); assumeNotPrecompile(to);
vm.assume(to != address(0)); vm.assume(to != address(0));
rln.register{value: MEMBERSHIP_DEPOSIT}(idCommitment); rln.register{value: MEMBERSHIP_DEPOSIT}(idCommitment);
@@ -171,7 +171,7 @@ contract RlnTest is Test {
function test__ValidWithdraw(address payable to) public { function test__ValidWithdraw(address payable to) public {
assumePayable(to); assumePayable(to);
assumeNoPrecompiles(to); assumeNotPrecompile(to);
uint256 idCommitment = 19014214495641488759237505126948346942972912379615652741039992445865937985820; uint256 idCommitment = 19014214495641488759237505126948346942972912379615652741039992445865937985820;