Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit b1ab377

Browse files
authored
chore: unpin forge and remove unused solarray dependency (#362)
**Motivation:** In #304 we pinned forge to the most recent nightly at the time, due to breaking changes that were introduced. I believe the specific breaking changes that affected us were reverted upstream on master in favor of the `expect-changes` feature branch which will hold forge breaking changes until v1, as all tests in the llama Also removes unused solarray dependency **Modifications:** Unpin the forge version and remove unused dependency **Result:** Unpin the forge version and remove unused dependency
1 parent f065514 commit b1ab377

File tree

9 files changed

+1
-27
lines changed

9 files changed

+1
-27
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919

2020
- name: Install Foundry
2121
uses: foundry-rs/foundry-toolchain@v1
22-
with:
23-
version: nightly-e15e33a07c0920189fc336391f538c3dad53da73
2422

2523
- name: Build contracts
2624
run: |
@@ -35,8 +33,6 @@ jobs:
3533

3634
- name: Install Foundry
3735
uses: foundry-rs/foundry-toolchain@v1
38-
with:
39-
version: nightly-e15e33a07c0920189fc336391f538c3dad53da73
4036

4137
- name: Run tests
4238
run: forge test -vvv
@@ -49,8 +45,6 @@ jobs:
4945

5046
- name: Install Foundry
5147
uses: foundry-rs/foundry-toolchain@v1
52-
with:
53-
version: nightly-e15e33a07c0920189fc336391f538c3dad53da73
5448

5549
- name: Run coverage
5650
run: forge coverage --report summary --report lcov
@@ -94,8 +88,6 @@ jobs:
9488

9589
- name: Install Foundry
9690
uses: foundry-rs/foundry-toolchain@v1
97-
with:
98-
version: nightly-e15e33a07c0920189fc336391f538c3dad53da73
9991

10092
- name: Check formatting
10193
run: forge fmt --check
@@ -108,8 +100,6 @@ jobs:
108100

109101
- name: Install Foundry
110102
uses: foundry-rs/foundry-toolchain@v1
111-
with:
112-
version: nightly-e15e33a07c0920189fc336391f538c3dad53da73
113103

114104
- name: Install scopelint
115105
uses: engineerd/[email protected]

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@
1414
path = lib/solady
1515
url = https://github.com/vectorized/solady
1616
commit = 3d57528984275d1746ee6597acd36277f51c091d
17-
[submodule "lib/solarray"]
18-
path = lib/solarray
19-
url = https://github.com/emo-eth/solarray
20-
commit = 4c3b8ff8e90c8cd11d30e02c1b6b2fcf9bc0f3db

lib/solarray

Lines changed: 0 additions & 1 deletion
This file was deleted.

remappings.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
@openzeppelin=lib/openzeppelin-contracts/contracts/
22
@solmate=lib/solmate/src/
3-
@solady=lib/solady/src/
4-
@solarray=lib/solarray/src/
3+
@solady=lib/solady/src/

test/LlamaCore.t.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {Test, console2, StdStorage, stdStorage} from "forge-std/Test.sol";
55

6-
import {Solarray} from "@solarray/Solarray.sol";
7-
86
import {MockAccountLogicContract} from "test/mock/MockAccountLogicContract.sol";
97
import {MockActionGuard} from "test/mock/MockActionGuard.sol";
108
import {MockMaliciousExtension} from "test/mock/MockMaliciousExtension.sol";

test/LlamaFactory.t.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {Test, console2} from "forge-std/Test.sol";
55

6-
import {Solarray} from "@solarray/Solarray.sol";
7-
86
import {SolarrayLlama} from "test/utils/SolarrayLlama.sol";
97
import {LlamaTestSetup} from "test/utils/LlamaTestSetup.sol";
108

test/LlamaPolicy.t.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {Base64} from "@openzeppelin/utils/Base64.sol";
77

88
import {Clones} from "@openzeppelin/proxy/Clones.sol";
99

10-
import {Solarray} from "@solarray/Solarray.sol";
11-
1210
import {LibString} from "@solady/utils/LibString.sol";
1311

1412
import {Roles, LlamaTestSetup} from "test/utils/LlamaTestSetup.sol";

test/llama-scripts/LlamaGovernanceScript.t.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {Test, console2} from "forge-std/Test.sol";
55

6-
import {Solarray} from "@solarray/Solarray.sol";
7-
86
import {MockActionGuard} from "test/mock/MockActionGuard.sol";
97
import {MockMaliciousExtension} from "test/mock/MockMaliciousExtension.sol";
108
import {MockProtocol} from "test/mock/MockProtocol.sol";

test/utils/LlamaTestSetup.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {stdJson} from "forge-std/Script.sol";
77

88
import {IERC20} from "@openzeppelin/token/ERC20/IERC20.sol";
99

10-
import {Solarray} from "@solarray/Solarray.sol";
11-
1210
import {MockProtocol} from "test/mock/MockProtocol.sol";
1311
import {MockScript} from "test/mock/MockScript.sol";
1412

0 commit comments

Comments
 (0)