Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nicka/lp' into nicka/lp-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
naddison36 committed Oct 16, 2024
2 parents 82efb5e + fa3be77 commit 14e33bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,20 @@ snapshot:
@forge snapshot

# Tests
test-std:
forge test --summary --fail-fast --show-progress

test:
@forge test --summary --fail-fast --show-progress
@FOUNDRY_NO_MATCH_CONTRACT=Invariant make test-std

test-f-%:
@FOUNDRY_MATCH_TEST=$* make test
@FOUNDRY_MATCH_TEST=$* make test-std

test-c-%:
@FOUNDRY_MATCH_CONTRACT=$* make test
@FOUNDRY_MATCH_CONTRACT=$* make test-std

test-all:
@make test-std

# Coverage
coverage:
Expand Down
7 changes: 2 additions & 5 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ remappings = [
"script/=./script",
"test/=./test",
"utils/=./src/contracts/utils",
"forge-std/=dependencies/forge-std-1.9.2/src/",
"forge-std/=dependencies/forge-std-1.9.3/src/",
"@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.0.2/",
"@openzeppelin/contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.0.2/",
"@solmate/=dependencies/solmate-6.7.0/src/",
Expand All @@ -33,8 +33,8 @@ shrink_run_limit = 5_000
[dependencies]
"@openzeppelin-contracts" = "5.0.2"
"@openzeppelin-contracts-upgradeable" = "5.0.2"
forge-std = { version = "1.9.2", git = "https://github.com/foundry-rs/forge-std.git", rev = "5a802d7c10abb4bbfb3e7214c75052ef9e6a06f8" }
solmate = "6.7.0"
forge-std = "1.9.3"

[soldeer]
recursive_deps = false
Expand All @@ -47,7 +47,4 @@ remappings_location = "config"
[rpc_endpoints]
mainnet = "${PROVIDER_URL}"

[etherscan]
mainnet = { key = "${ETHERSCAN_API_KEY}", url = "https://etherscan.io/", chain = "mainnet" }

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

0 comments on commit 14e33bb

Please sign in to comment.