Skip to content

Commit

Permalink
evm: remove; import chainlink-integrations/evm (#16255)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmank88 authored Feb 6, 2025
1 parent e90f41f commit 293a2c0
Show file tree
Hide file tree
Showing 799 changed files with 1,298 additions and 39,142 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
# Inclusive check: all (new) modules are analyzed, but no need to enable "required" checks for each one
golangci-matrix-results-validation:
name: lint
if: ${{ always() && needs.golangci.result != 'skipped' }}
if: ${{ always() && needs.golangci.result != 'skipped' && !contains(join(github.event.pull_request.labels.*.name, ' '), 'allow-lint-issues') }}
needs: [golangci]
runs-on: ubuntu-latest
steps:
Expand Down
39 changes: 0 additions & 39 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ packages:
TxStrategy:
TxAttemptBuilder:
TxStore:
github.com/smartcontractkit/chainlink-framework/multinode:
config:
dir: common/types/mocks
outpkg: mocks
interfaces:
Subscription:
github.com/smartcontractkit/chainlink/v2/core/bridges:
interfaces:
ORM:
Expand All @@ -47,39 +41,9 @@ packages:
interfaces:
Dispatcher:
Receiver:
github.com/smartcontractkit/chainlink/v2/evm/client:
config:
dir: evm/client/clienttest
outpkg: clienttest
interfaces:
Client:
github.com/smartcontractkit/chainlink/v2/evm/config:
interfaces:
GasEstimator:
ChainScopedConfig:
github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders:
interfaces:
ORM:
github.com/smartcontractkit/chainlink/v2/evm/gas:
interfaces:
Config:
EvmFeeEstimator:
feeEstimatorClient:
config:
mockname: FeeEstimatorClient
feeHistoryEstimatorClient:
config:
mockname: FeeHistoryEstimatorClient
EvmEstimator:
github.com/smartcontractkit/chainlink/v2/evm/gas/rollups:
interfaces:
L1Oracle:
l1OracleClient:
config:
mockname: L1OracleClient
github.com/smartcontractkit/chainlink/v2/evm/keystore:
interfaces:
Eth:
github.com/smartcontractkit/chainlink/v2/core/chains/evm/log:
interfaces:
Broadcaster:
Expand All @@ -88,9 +52,6 @@ packages:
github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller:
interfaces:
LogPoller:
github.com/smartcontractkit/chainlink/v2/evm/monitor:
interfaces:
BalanceMonitor:
github.com/smartcontractkit/chainlink/v2/core/chains/evm/txm:
interfaces:
Client:
Expand Down
111 changes: 0 additions & 111 deletions common/types/mocks/subscription.go

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import (

"github.com/smartcontractkit/chainlink-common/pkg/types"

"github.com/smartcontractkit/chainlink-integrations/evm/assets"
"github.com/smartcontractkit/chainlink-integrations/evm/client"
configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
Expand All @@ -38,8 +40,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
"github.com/smartcontractkit/chainlink/v2/evm/assets"
"github.com/smartcontractkit/chainlink/v2/evm/client"
)

const chainID = 1337
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import (
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
"github.com/smartcontractkit/chainlink-ccip/pluginconfig"

"github.com/smartcontractkit/chainlink-integrations/evm/client"
"github.com/smartcontractkit/chainlink-integrations/evm/utils"
ubig "github.com/smartcontractkit/chainlink-integrations/evm/utils/big"
evmconfig "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
Expand All @@ -36,9 +39,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
"github.com/smartcontractkit/chainlink/v2/evm/client"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
ubig "github.com/smartcontractkit/chainlink/v2/evm/utils/big"
)

const ChainID = 1337
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/ccipevm/commitcodec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"

"github.com/smartcontractkit/chainlink-integrations/evm/utils"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
)

var randomCommitReport = func() cciptypes.CommitPluginReport {
Expand Down
4 changes: 2 additions & 2 deletions core/capabilities/ccip/ccipevm/executecodec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (

cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"

"github.com/smartcontractkit/chainlink-integrations/evm/assets"
"github.com/smartcontractkit/chainlink-integrations/evm/utils"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/report_codec"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/evm/assets"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
)

var randomExecuteReport = func(t *testing.T, d *testSetupData) cciptypes.ExecutePluginReport {
Expand Down
4 changes: 2 additions & 2 deletions core/capabilities/ccip/ccipevm/msghasher.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
"github.com/smartcontractkit/chainlink-common/pkg/logger"

"github.com/smartcontractkit/chainlink-integrations/evm/types"
"github.com/smartcontractkit/chainlink-integrations/evm/utils"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
"github.com/smartcontractkit/chainlink/v2/evm/types"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions core/capabilities/ccip/ccipevm/msghasher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (

"github.com/smartcontractkit/chainlink-common/pkg/logger"

"github.com/smartcontractkit/chainlink-integrations/evm/assets"
"github.com/smartcontractkit/chainlink-integrations/evm/utils"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/evm/assets"
"github.com/smartcontractkit/chainlink/v2/evm/utils"

cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
)
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/ethereum/go-ethereum/crypto"

"github.com/smartcontractkit/chainlink/v2/evm/utils"
"github.com/smartcontractkit/chainlink-integrations/evm/utils"
)

// HashedCapabilityID returns the hashed capability id in a manner equivalent to the capability registry.
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/common/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-integrations/evm/assets"
capcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/evm/assets"
)

func Test_HashedCapabilityId(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/configs/evm/chain_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/smartcontractkit/chainlink-ccip/pkg/consts"

evmtypes "github.com/smartcontractkit/chainlink-integrations/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
evmtypes "github.com/smartcontractkit/chainlink/v2/evm/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/configs/evm/contract_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
"github.com/smartcontractkit/chainlink-common/pkg/codec"

evmtypes "github.com/smartcontractkit/chainlink-integrations/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_home"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
Expand All @@ -21,7 +22,6 @@ import (
kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/aggregator_v3_interface"
evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
evmtypes "github.com/smartcontractkit/chainlink/v2/evm/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/configs/evm/usdc.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package evm

import (
evmtypes "github.com/smartcontractkit/chainlink/v2/evm/types"
evmtypes "github.com/smartcontractkit/chainlink-integrations/evm/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/delegate.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

chainsel "github.com/smartcontractkit/chain-selectors"

"github.com/smartcontractkit/chainlink-integrations/evm/config/toml"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/launcher"
Expand All @@ -42,7 +43,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
"github.com/smartcontractkit/chainlink/v2/core/services/relay"
"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
"github.com/smartcontractkit/chainlink/v2/evm/config/toml"
"github.com/smartcontractkit/chainlink/v2/plugins"
)

Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/launcher/deployment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink-integrations/evm/utils"
mocktypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
)

func Test_ccipDeployment_Transitions(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/ccip/launcher/launcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (

ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"

"github.com/smartcontractkit/chainlink-integrations/evm/utils"
cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
"github.com/smartcontractkit/chainlink/v2/evm/utils"
)

func Test_createDON(t *testing.T) {
Expand Down
Loading

0 comments on commit 293a2c0

Please sign in to comment.