Skip to content

Commit

Permalink
Refactor evm registry packages (smartcontractkit#11374)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferglor
ferglor authored Nov 30, 2023
1 parent 74e4c68 commit 82eb917
Show file tree
Hide file tree
Showing 94 changed files with 92 additions and 91 deletions.
6 changes: 3 additions & 3 deletions core/scripts/chaincli/handler/debug.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/smartcontractkit/chainlink/core/scripts/common"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
"github.com/smartcontractkit/chainlink/v2/core/utils"
bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
)
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/chaincli/handler/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/umbracle/ethgo/abi"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"

"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/chaincli/handler/report.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
ocr2keepers20 "github.com/smartcontractkit/chainlink-automation/pkg/v2"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper2_0"
evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm20"
evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20"
)

type OCR2ReportDataElem struct {
Expand Down
4 changes: 2 additions & 2 deletions core/services/ocr2/delegate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/median"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/mercury"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21"
ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21"
ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
ocr2vrfconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/config"
ocr2coordinator "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/coordinator"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/juelsfeecoin"
Expand Down
2 changes: 1 addition & 1 deletion core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services"

"github.com/smartcontractkit/chainlink/v2/core/logger"
evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
"github.com/smartcontractkit/chainlink/v2/core/static"
"github.com/smartcontractkit/chainlink/v2/core/utils"
Expand Down
0 ...ices/ocr2/plugins/ocr2keeper/evm20/abi.go → ...plugins/ocr2keeper/evmregistry/v20/abi.go
View file
File renamed without changes.
0 ...ocr2/plugins/ocr2keeper/evm20/abi_test.go → ...ns/ocr2keeper/evmregistry/v20/abi_test.go
View file
File renamed without changes.
0 .../ocr2/plugins/ocr2keeper/evm20/encoder.go → ...ins/ocr2keeper/evmregistry/v20/encoder.go
View file
File renamed without changes.
0 .../plugins/ocr2keeper/evm20/encoder_test.go → ...cr2keeper/evmregistry/v20/encoder_test.go
View file
File renamed without changes.
0 ...ces/ocr2/plugins/ocr2keeper/evm20/head.go → ...lugins/ocr2keeper/evmregistry/v20/head.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions .../plugins/ocr2keeper/evm20/log_provider.go → ...cr2keeper/evmregistry/v20/log_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/smartcontractkit/chainlink-automation/pkg/v2/encoding"

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

evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
registry "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper2_0"
Expand Down
0 ...lugins/ocr2keeper/evm20/mocks/registry.go → ...2keeper/evmregistry/v20/mocks/registry.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...ocr2/plugins/ocr2keeper/evm20/registry.go → ...ns/ocr2keeper/evmregistry/v20/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v2"

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

"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
Expand Down
0 ...plugins/ocr2keeper/evm20/registry_test.go → ...r2keeper/evmregistry/v20/registry_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...2/plugins/ocr2keeper/evm21/active_list.go → ...ocr2keeper/evmregistry/v21/active_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

// ActiveUpkeepList is a list to manage active upkeep IDs
Expand Down
2 changes: 1 addition & 1 deletion ...gins/ocr2keeper/evm21/active_list_test.go → ...eeper/evmregistry/v21/active_list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

func TestActiveUpkeepList(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...evm21/autotelemetry21/custom_telemetry.go → ...y/v21/autotelemetry21/custom_telemetry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services"

"github.com/smartcontractkit/chainlink/v2/core/logger"
evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
"github.com/smartcontractkit/chainlink/v2/core/static"
"github.com/smartcontractkit/chainlink/v2/core/utils"
Expand Down
2 changes: 1 addition & 1 deletion .../autotelemetry21/custom_telemetry_test.go → .../autotelemetry21/custom_telemetry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
headtracker "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/logger"
evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
)

// const historySize = 4
Expand Down
0 ...gins/ocr2keeper/evm21/block_subscriber.go → ...eeper/evmregistry/v21/block_subscriber.go
View file
File renamed without changes.
0 ...ocr2keeper/evm21/block_subscriber_test.go → .../evmregistry/v21/block_subscriber_test.go
View file
File renamed without changes.
0 ...ocr2/plugins/ocr2keeper/evm21/core/abi.go → ...ns/ocr2keeper/evmregistry/v21/core/abi.go
View file
File renamed without changes.
0 ...ugins/ocr2keeper/evm21/core/interfaces.go → ...keeper/evmregistry/v21/core/interfaces.go
View file
File renamed without changes.
0 ...r/evm21/core/mocks/upkeep_state_reader.go → ...try/v21/core/mocks/upkeep_state_reader.go
View file
File renamed without changes.
0 .../plugins/ocr2keeper/evm21/core/payload.go → ...cr2keeper/evmregistry/v21/core/payload.go
View file
File renamed without changes.
0 ...ins/ocr2keeper/evm21/core/payload_test.go → ...eper/evmregistry/v21/core/payload_test.go
View file
File renamed without changes.
0 ...plugins/ocr2keeper/evm21/core/testutil.go → ...r2keeper/evmregistry/v21/core/testutil.go
View file
File renamed without changes.
0 .../plugins/ocr2keeper/evm21/core/trigger.go → ...cr2keeper/evmregistry/v21/core/trigger.go
View file
File renamed without changes.
0 ...ins/ocr2keeper/evm21/core/trigger_test.go → ...eper/evmregistry/v21/core/trigger_test.go
View file
File renamed without changes.
0 ...cr2/plugins/ocr2keeper/evm21/core/type.go → ...s/ocr2keeper/evmregistry/v21/core/type.go
View file
File renamed without changes.
0 ...lugins/ocr2keeper/evm21/core/type_test.go → ...2keeper/evmregistry/v21/core/type_test.go
View file
File renamed without changes.
0 ...r2/plugins/ocr2keeper/evm21/core/utils.go → .../ocr2keeper/evmregistry/v21/core/utils.go
View file
File renamed without changes.
0 ...ugins/ocr2keeper/evm21/core/utils_test.go → ...keeper/evmregistry/v21/core/utils_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gins/ocr2keeper/evm21/encoding/encoder.go → ...eeper/evmregistry/v21/encoding/encoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion ...ocr2keeper/evm21/encoding/encoder_test.go → .../evmregistry/v21/encoding/encoder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

func TestReportEncoder_EncodeExtract(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions ...ns/ocr2keeper/evm21/encoding/interface.go → ...per/evmregistry/v21/encoding/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
)

const (
Expand Down
5 changes: 2 additions & 3 deletions ...ugins/ocr2keeper/evm21/encoding/packer.go → ...keeper/evmregistry/v21/encoding/packer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
)

// triggerWrapper is a wrapper for the different trigger types (log and condition triggers).
Expand Down
5 changes: 2 additions & 3 deletions .../ocr2keeper/evm21/encoding/packer_test.go → ...r/evmregistry/v21/encoding/packer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import (

ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
automation21Utils "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
)

func TestPacker_PackReport(t *testing.T) {
Expand Down
0 .../ocr2/plugins/ocr2keeper/evm21/keyring.go → ...ins/ocr2keeper/evmregistry/v21/keyring.go
View file
File renamed without changes.
0 .../plugins/ocr2keeper/evm21/keyring_test.go → ...cr2keeper/evmregistry/v21/keyring_test.go
View file
File renamed without changes.
0 ...cr2keeper/evm21/logprovider/block_time.go → ...evmregistry/v21/logprovider/block_time.go
View file
File renamed without changes.
0 ...eper/evm21/logprovider/block_time_test.go → ...gistry/v21/logprovider/block_time_test.go
View file
File renamed without changes.
0 ...ns/ocr2keeper/evm21/logprovider/buffer.go → ...per/evmregistry/v21/logprovider/buffer.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r2keeper/evm21/logprovider/buffer_test.go → ...vmregistry/v21/logprovider/buffer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

func TestLogEventBuffer_GetBlocksInRange(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/ocr2keeper/evm21/logprovider/factory.go → ...er/evmregistry/v21/logprovider/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

// New creates a new log event provider and recoverer.
Expand Down
0 ...ns/ocr2keeper/evm21/logprovider/filter.go → ...per/evmregistry/v21/logprovider/filter.go
View file
File renamed without changes.
0 ...2keeper/evm21/logprovider/filter_store.go → ...mregistry/v21/logprovider/filter_store.go
View file
File renamed without changes.
0 ...er/evm21/logprovider/filter_store_test.go → ...stry/v21/logprovider/filter_store_test.go
View file
File renamed without changes.
0 ...r2keeper/evm21/logprovider/filter_test.go → ...vmregistry/v21/logprovider/filter_test.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...per/evm21/logprovider/integration_test.go → ...istry/v21/logprovider/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
kevmcore "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
evmregistry21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
"github.com/smartcontractkit/chainlink/v2/core/services/pg"
)

Expand Down Expand Up @@ -150,7 +150,7 @@ func TestIntegration_LogEventProvider_UpdateConfig(t *testing.T) {
require.Equal(t, 1, len(addrs))

t.Run("update filter config", func(t *testing.T) {
upkeepID := kevmcore.GenUpkeepID(ocr2keepers.LogTrigger, "111")
upkeepID := evmregistry21.GenUpkeepID(ocr2keepers.LogTrigger, "111")
id := upkeepID.BigInt()
cfg := newPlainLogTriggerConfig(addrs[0])
b, err := ethClient.BlockByHash(ctx, backend.Commit())
Expand Down Expand Up @@ -182,7 +182,7 @@ func TestIntegration_LogEventProvider_UpdateConfig(t *testing.T) {
})

t.Run("register same log filter", func(t *testing.T) {
upkeepID := kevmcore.GenUpkeepID(ocr2keepers.LogTrigger, "222")
upkeepID := evmregistry21.GenUpkeepID(ocr2keepers.LogTrigger, "222")
id := upkeepID.BigInt()
cfg := newPlainLogTriggerConfig(addrs[0])
b, err := ethClient.BlockByHash(ctx, backend.Commit())
Expand Down Expand Up @@ -663,7 +663,7 @@ func setupDependencies(t *testing.T, db *sqlx.DB, backend *backends.SimulatedBac
return lp, ethClient
}

func setup(lggr logger.Logger, poller logpoller.LogPoller, c client.Client, stateStore kevmcore.UpkeepStateReader, filterStore logprovider.UpkeepFilterStore, opts *logprovider.LogTriggersOptions) (logprovider.LogEventProvider, logprovider.LogRecoverer) {
func setup(lggr logger.Logger, poller logpoller.LogPoller, c client.Client, stateStore evmregistry21.UpkeepStateReader, filterStore logprovider.UpkeepFilterStore, opts *logprovider.LogTriggersOptions) (logprovider.LogEventProvider, logprovider.LogRecoverer) {
packer := logprovider.NewLogEventsPacker()
if opts == nil {
o := logprovider.NewOptions(200)
Expand Down
2 changes: 1 addition & 1 deletion ...cr2keeper/evm21/logprovider/log_packer.go → ...evmregistry/v21/logprovider/log_packer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

type LogDataPacker interface {
Expand Down
3 changes: 2 additions & 1 deletion .../ocr2keeper/evm21/logprovider/provider.go → ...r/evmregistry/v21/logprovider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ import (
ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

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

"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/pg"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)
Expand Down
0 .../evm21/logprovider/provider_life_cycle.go → ...ry/v21/logprovider/provider_life_cycle.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...1/logprovider/provider_life_cycle_test.go → ...1/logprovider/provider_life_cycle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
)

func TestLogEventProvider_LifeCycle(t *testing.T) {
Expand Down
0 ...keeper/evm21/logprovider/provider_test.go → ...registry/v21/logprovider/provider_test.go
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion ...ocr2keeper/evm21/logprovider/recoverer.go → .../evmregistry/v21/logprovider/recoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ import (
ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

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

"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/pg"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)
Expand Down
4 changes: 2 additions & 2 deletions ...eeper/evm21/logprovider/recoverer_test.go → ...egistry/v21/logprovider/recoverer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core/mocks"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks"
"github.com/smartcontractkit/chainlink/v2/core/services/pg"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)
Expand Down
0 ...ugins/ocr2keeper/evm21/mercury/mercury.go → ...keeper/evmregistry/v21/mercury/mercury.go
View file
File renamed without changes.
0 .../ocr2keeper/evm21/mercury/mercury_test.go → ...r/evmregistry/v21/mercury/mercury_test.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...r2keeper/evm21/mercury/streams/streams.go → ...vmregistry/v21/mercury/streams/streams.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02"
v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02"
v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)

Expand Down
8 changes: 4 additions & 4 deletions ...per/evm21/mercury/streams/streams_test.go → ...istry/v21/mercury/streams/streams_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02"
v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02"
v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03"
)

type MockMercuryConfigProvider struct {
Expand Down
0 ...r/evm21/mercury/upkeep_failure_reasons.go → ...try/v21/mercury/upkeep_failure_reasons.go
View file
File renamed without changes.
0 ...ocr2keeper/evm21/mercury/upkeep_states.go → .../evmregistry/v21/mercury/upkeep_states.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/ocr2keeper/evm21/mercury/v02/request.go → ...er/evmregistry/v21/mercury/v02/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services"

"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)

Expand Down
3 changes: 1 addition & 2 deletions ...per/evm21/mercury/v02/v02_request_test.go → ...istry/v21/mercury/v02/v02_request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/utils"

"github.com/stretchr/testify/assert"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...s/ocr2keeper/evm21/mercury/v03/request.go → ...er/evmregistry/v21/mercury/v03/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services"

"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)

Expand Down
5 changes: 2 additions & 3 deletions ...per/evm21/mercury/v03/v03_request_test.go → ...istry/v21/mercury/v03/v03_request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mocks"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks"
"github.com/smartcontractkit/chainlink/v2/core/utils"

"github.com/stretchr/testify/assert"

"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
)

const (
Expand Down
0 ...ins/ocr2keeper/evm21/mocks/http_client.go → ...eper/evmregistry/v21/mocks/http_client.go
View file
File renamed without changes.
0 ...lugins/ocr2keeper/evm21/mocks/registry.go → ...2keeper/evmregistry/v21/mocks/registry.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ugins/ocr2keeper/evm21/payload_builder.go → ...keeper/evmregistry/v21/payload_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"

"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
)

type payloadBuilder struct {
Expand Down
Loading

0 comments on commit 82eb917

Please sign in to comment.