Skip to content

Commit

Permalink
Reduce diff with fork (#1228)
Browse files Browse the repository at this point in the history
While merging ccip into chainlink, some of the diff doesn't appear to be
used. This PR cleans up some of the diff
  • Loading branch information
RensR authored Jul 30, 2024
1 parent cdb2d54 commit 1a0aa23
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 305 deletions.
1 change: 0 additions & 1 deletion contracts/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
artifacts
foundry-artifacts
cache
node_modules
solc
Expand Down
3 changes: 0 additions & 3 deletions contracts/.solhintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# 377 warnings
#./src/v0.8/automation

# Ignore frozen Automation code
./src/v0.8/automation/v1_2
./src/v0.8/automation/interfaces/v1_2
Expand Down
11 changes: 0 additions & 11 deletions contracts/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,6 @@ wrappers-all: pnpmdep mockery abigen ## Recompiles solidity contracts and their
# go_generate contains a call to compile all contracts before generating wrappers
go generate ../core/gethwrappers/go_generate.go

# Custom wrapper generation for OCR2VRF as their contracts do not exist in this repo
.PHONY: go-solidity-wrappers-ocr2vrf
go-solidity-wrappers-ocr2vrf: pnpmdep abigen ## Recompiles OCR2VRF solidity contracts and their go wrappers.
./scripts/native_solc_compile_all_ocr2vrf
# replace the go:generate_disabled directive with the regular go:generate directive
sed -i '' 's/go:generate_disabled/go:generate/g' ../core/gethwrappers/ocr2vrf/go_generate.go
go generate ../core/gethwrappers/ocr2vrf
go generate ../core/internal/mocks
# put the go:generate_disabled directive back
sed -i '' 's/go:generate/go:generate_disabled/g' ../core/gethwrappers/ocr2vrf/go_generate.go

help:
@echo ""
@echo " .__ .__ .__ .__ __"
Expand Down
4 changes: 1 addition & 3 deletions contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ let config = {
paths: {
artifacts: './artifacts',
cache: './cache',
// Only use sources relevant to CCIP, revert this when merging CCIP into the main repo.
sources: './src/v0.8',
// Only test CCIP, revert this when merging CCIP into the main repo.
tests: './test/v0.8/ccip',
tests: './test/v0.8',
},
typechain: {
outDir: './typechain',
Expand Down
23 changes: 0 additions & 23 deletions contracts/src/v0.8/vendor/Context.sol

This file was deleted.

36 changes: 0 additions & 36 deletions contracts/src/v0.8/vendor/IERC2771Recipient.sol

This file was deleted.

90 changes: 0 additions & 90 deletions contracts/src/v0.8/vendor/Pausable.sol

This file was deleted.

138 changes: 0 additions & 138 deletions contracts/src/v0.8/vendor/nomad-xyz/ExcessivelySafeCall.sol

This file was deleted.

0 comments on commit 1a0aa23

Please sign in to comment.