Fix rebasing with development

LiskHQ · Jun 18, 2024 · a105603 · a105603
1 parent 37cc2e9
commit a105603
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 29 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -30,21 +30,10 @@ jobs:
         with:
           submodules: recursive
 
-      #- name: Install Foundry
-      #  uses: foundry-rs/foundry-toolchain@v1
-      #  with:
-      #    version: nightly
-
-      - uses: actions/checkout@v4
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
         with:
-         repository: foundry-rs/foundry
-         path: ./foundry
-         submodules: recursive
-         ref: 5ac78a9cd4b94dc53d1fe5e0f42372b28b5a7559
-
-      - name: Install Forge
-        run: |
-         cargo install --path ./foundry/crates/forge --profile local --force --locked      
+          version: nightly    
 
       - name: Check formatting
         if: ${{ contains(matrix.system.os, 'windows') == false }}

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,8 @@ deployment/devnet/
 
 # Slither-mutation files
 mutation_campaign
+
+# Echidna files
+crytic-export/combined_solc.json
+test/fuzzing/coverage/
+test/fuzzing/covered.*
diff --git a/foundry.toml b/foundry.toml
@@ -20,7 +20,6 @@ remappings = [
     'solidity-stringutils/=lib/openzeppelin-foundry-upgrades/lib/solidity-stringutils/',
 ]
 deny_warnings = true
-
 ffi = true
 ast = true
 build_info = true

diff --git a/lib/properties b/lib/properties
diff --git a/test/L1/L1LiskToken.t.sol b/test/L1/L1LiskToken.t.sol
@@ -26,7 +26,7 @@ contract L1LiskTokenTest is Test {
         l1LiskToken = new L1LiskToken();
     }
 
-    function test_Initialize() public {
+    function test_Initialize() public view {
         assertEq(l1LiskToken.name(), NAME);
         assertEq(l1LiskToken.symbol(), SYMBOL);
         assertEq(l1LiskToken.totalSupply(), TOTAL_SUPPLY);
@@ -199,7 +199,7 @@ contract L1LiskTokenTest is Test {
         assertEq(l1LiskToken.pendingOwner(), alice);
     }
 
-    function test_DefaultAdminRoleIsRoleAdminForBurnerRole() public {
+    function test_DefaultAdminRoleIsRoleAdminForBurnerRole() public view {
         assertEq(l1LiskToken.DEFAULT_ADMIN_ROLE(), l1LiskToken.getRoleAdmin(l1LiskToken.BURNER_ROLE()));
     }
 }
diff --git a/test/L1/L1VestingWallet.t.sol b/test/L1/L1VestingWallet.t.sol
@@ -77,7 +77,7 @@ contract L1VestingWalletTest is Test {
         mockToken.transfer(address(l1VestingWallet), vestAmount);
     }
 
-    function test_Initialize() public {
+    function test_Initialize() public view {
         assertEq(l1VestingWallet.name(), name);
         assertEq(l1VestingWallet.start(), startTimestamp);
         assertEq(l1VestingWallet.duration(), durationSeconds);

diff --git a/test/L2/L2Claim.t.sol b/test/L2/L2Claim.t.sol
@@ -191,7 +191,7 @@ contract L2ClaimTest is Test {
         l2ClaimImplementation.initialize(address(lsk), bytes32(0), block.timestamp + RECOVER_PERIOD);
     }
 
-    function test_Version() public {
+    function test_Version() public view {
         assertEq(l2Claim.version(), "1.0.0");
     }
 

diff --git a/test/L2/L2LiskToken.t.sol b/test/L2/L2LiskToken.t.sol
@@ -44,7 +44,7 @@ contract L2LiskTokenTest is Test {
         new L2LiskToken(address(0));
     }
 
-    function test_Initialize() public {
+    function test_Initialize() public view {
         assertEq(l2LiskToken.name(), "Lisk");
         assertEq(l2LiskToken.symbol(), "LSK");
         assertEq(l2LiskToken.decimals(), 18);
@@ -176,12 +176,12 @@ contract L2LiskTokenTest is Test {
         assertNotEq(address(l2LiskTokenSalted), l2LiskTokenAddressCalculated);
     }
 
-    function test_GetBridge() public {
+    function test_GetBridge() public view {
         assertEq(l2LiskToken.bridge(), bridge);
         assertEq(l2LiskToken.BRIDGE(), bridge);
     }
 
-    function test_GetRemoteToken() public {
+    function test_GetRemoteToken() public view {
         assertEq(l2LiskToken.remoteToken(), remoteToken);
         assertEq(l2LiskToken.REMOTE_TOKEN(), remoteToken);
     }

diff --git a/test/L2/L2LockingPosition.t.sol b/test/L2/L2LockingPosition.t.sol
@@ -517,7 +517,7 @@ contract L2LockingPositionTest is Test {
         l2LockingPosition.removeLockingPosition(positionId);
     }
 
-    function test_GetLockingPosition_PositionDoesNotExist() public {
+    function test_GetLockingPosition_PositionDoesNotExist() public view {
         IL2LockingPosition.LockingPosition memory position = l2LockingPosition.getLockingPosition(1);
         assertEq(position.creator, address(0));
         assertEq(position.amount, 0);

diff --git a/test/L2/L2Reward.t.sol b/test/L2/L2Reward.t.sol
@@ -113,7 +113,7 @@ contract L2RewardTest is Test {
         l2Staking.addCreator(address(l2Reward));
     }
 
-    function test_initialize() public {
+    function test_initialize() public view {
         assertEq(l2Reward.lastTrsDate(), deploymentDate);
         assertEq(l2Reward.OFFSET(), 150);
         assertEq(l2Reward.REWARD_DURATION(), 30);

diff --git a/test/L2/L2VestingWallet.t.sol b/test/L2/L2VestingWallet.t.sol
@@ -76,7 +76,7 @@ contract L2VestingWalletTest is Test {
         mockToken.transfer(address(l2VestingWallet), vestAmount);
     }
 
-    function test_Initialize() public {
+    function test_Initialize() public view {
         assertEq(l2VestingWallet.name(), name);
         assertEq(l2VestingWallet.start(), startTimestamp);
         assertEq(l2VestingWallet.duration(), durationSeconds);

diff --git a/test/L2/L2VotingPower.t.sol b/test/L2/L2VotingPower.t.sol
@@ -99,7 +99,7 @@ contract L2VotingPowerTest is Test {
         );
     }
 
-    function test_Version() public {
+    function test_Version() public view {
         assertEq(l2VotingPower.version(), "1.0.0");
     }
 
@@ -329,7 +329,7 @@ contract L2VotingPowerTest is Test {
         assertEq(l2VotingPower.clock(), blockTimestamp + 1);
     }
 
-    function test_ClockMode() public {
+    function test_ClockMode() public view {
         assertEq(l2VotingPower.CLOCK_MODE(), "mode=timestamp");
     }
 

diff --git a/test/L2/paused/L2GovernorPaused.t.sol b/test/L2/paused/L2GovernorPaused.t.sol
@@ -32,7 +32,7 @@ contract L2GovernorPausedTest is Test, ERC1155Holder, ERC721Holder {
     TimelockController timelock;
     address initialOwner;
 
-    function assertInitParamsEq() internal {
+    function assertInitParamsEq() internal view {
         assertEq(l2Governor.name(), "Lisk Governor");
         assertEq(l2Governor.votingDelay(), 0);
         assertEq(l2Governor.votingPeriod(), 604800);

diff --git a/test/L2/paused/L2VotingPowerPaused.t.sol b/test/L2/paused/L2VotingPowerPaused.t.sol
@@ -33,7 +33,7 @@ contract L2VotingPowerPausedTest is Test {
 
     address lockingPositionContractAddress;
 
-    function assertInitParamsEq() internal {
+    function assertInitParamsEq() internal view {
         assertEq(l2VotingPower.lockingPositionAddress(), lockingPositionContractAddress);
         assertEq(l2VotingPower.name(), "Lisk Voting Power");
         assertEq(l2VotingPower.symbol(), "vpLSK");