Skip to content

Commit 4992415

Browse files
pavel-raykovpavel-raykov
authored
Code (#1562)
1 parent 242a8fa commit 4992415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+75
-109
lines changed

‎chains/solana/utils/common/event.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
bin "github.com/gagliardetto/binary"
1010

11-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
11+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
1212

1313
"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/latest/ccip_offramp"
1414
)

‎commit/chainfee/observation.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ import (
1111

1212
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1313
"github.com/smartcontractkit/chainlink-common/pkg/types"
14-
15-
"github.com/smartcontractkit/chainlink-ccip/internal/libs/asynclib"
16-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
17-
14+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
1815
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
1916

17+
"github.com/smartcontractkit/chainlink-ccip/internal/libs/asynclib"
2018
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
2119
)
2220

‎commit/chainfee/outcome.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import (
99

1010
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1111
"github.com/smartcontractkit/chainlink-common/pkg/types"
12-
13-
"github.com/smartcontractkit/chainlink-ccip/internal/libs/mathslib"
14-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
15-
12+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
1613
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
1714

15+
"github.com/smartcontractkit/chainlink-ccip/internal/libs/mathslib"
1816
"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon"
1917
"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon/consensus"
2018
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"

‎commit/chainfee/outcome_test.go‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,25 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/smartcontractkit/chainlink-ccip/internal"
11-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
12-
13-
"github.com/stretchr/testify/mock"
14-
1510
mapset "github.com/deckarep/golang-set/v2"
16-
libocrtypes "github.com/smartcontractkit/libocr/ragep2p/types"
17-
18-
"github.com/smartcontractkit/chainlink-ccip/chainconfig"
19-
mock_home_chain "github.com/smartcontractkit/chainlink-ccip/mocks/internal_/reader"
20-
"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
21-
2211
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/mock"
2313
"github.com/stretchr/testify/require"
2414

2515
"github.com/smartcontractkit/libocr/commontypes"
16+
libocrtypes "github.com/smartcontractkit/libocr/ragep2p/types"
2617

2718
commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
2819
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2920
"github.com/smartcontractkit/chainlink-common/pkg/types"
30-
21+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
3122
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
3223

24+
"github.com/smartcontractkit/chainlink-ccip/chainconfig"
25+
"github.com/smartcontractkit/chainlink-ccip/internal"
3326
"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon"
27+
mock_home_chain "github.com/smartcontractkit/chainlink-ccip/mocks/internal_/reader"
28+
"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
3429
"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
3530
)
3631

‎commit/factory.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ import (
1212
"github.com/smartcontractkit/chainlink-common/pkg/beholder"
1313
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1414
"github.com/smartcontractkit/chainlink-common/pkg/types"
15-
"github.com/smartcontractkit/chainlink-common/pkg/types/core"
16-
15+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
1716
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
17+
"github.com/smartcontractkit/chainlink-common/pkg/types/core"
1818

1919
"github.com/smartcontractkit/chainlink-ccip/commit/internal/builder"
2020
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
2121
"github.com/smartcontractkit/chainlink-ccip/commit/metrics"
2222
"github.com/smartcontractkit/chainlink-ccip/internal/plugintypes"
2323
"github.com/smartcontractkit/chainlink-ccip/internal/reader"
24-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
2524
"github.com/smartcontractkit/chainlink-ccip/pkg/contractreader"
2625
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
2726
readerpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"

‎commit/merkleroot/observation.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import (
2222
"github.com/smartcontractkit/chainlink-common/pkg/hashutil"
2323
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2424
"github.com/smartcontractkit/chainlink-common/pkg/merklemulti"
25-
25+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
2626
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
2727

2828
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
2929
"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon"
3030
"github.com/smartcontractkit/chainlink-ccip/internal/plugintypes"
3131
"github.com/smartcontractkit/chainlink-ccip/internal/reader"
32-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
3332
"github.com/smartcontractkit/chainlink-ccip/pkg/contractreader"
3433
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
3534
readerpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"

‎commit/merkleroot/query.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"fmt"
77
"time"
88

9+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
910
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
1011

1112
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
12-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
1313
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
1414
)
1515

‎commit/merkleroot/query_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ import (
99
"github.com/stretchr/testify/require"
1010

1111
"github.com/smartcontractkit/chainlink-common/pkg/logger"
12-
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
13-
12+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
1413
"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
14+
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
1515

1616
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
1717
"github.com/smartcontractkit/chainlink-ccip/internal/libs/testhelpers"
1818
"github.com/smartcontractkit/chainlink-ccip/internal/plugintypes"
1919
rmnmocks "github.com/smartcontractkit/chainlink-ccip/mocks/commit/merkleroot/rmn"
2020
"github.com/smartcontractkit/chainlink-ccip/mocks/pkg/reader"
21-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
2221
"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
2322
)
2423

‎commit/plugin.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1919
"github.com/smartcontractkit/chainlink-common/pkg/merklemulti"
2020
"github.com/smartcontractkit/chainlink-common/pkg/services"
21-
21+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
2222
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
2323

2424
"github.com/smartcontractkit/chainlink-ccip/commit/chainfee"
@@ -34,7 +34,6 @@ import (
3434
dt "github.com/smartcontractkit/chainlink-ccip/internal/plugincommon/discovery/discoverytypes"
3535
"github.com/smartcontractkit/chainlink-ccip/internal/plugintypes"
3636
"github.com/smartcontractkit/chainlink-ccip/internal/reader"
37-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
3837
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
3938
ocrtypecodec "github.com/smartcontractkit/chainlink-ccip/pkg/ocrtypecodec/v1"
4039
readerpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"

‎commit/plugin_e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
2626
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2727
"github.com/smartcontractkit/chainlink-common/pkg/types"
28+
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
2829
"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
2930

3031
"github.com/smartcontractkit/chainlink-ccip/chainconfig"
@@ -42,7 +43,6 @@ import (
4243
"github.com/smartcontractkit/chainlink-ccip/internal/reader"
4344
reader_mock "github.com/smartcontractkit/chainlink-ccip/mocks/internal_/reader"
4445
readerpkg_mock "github.com/smartcontractkit/chainlink-ccip/mocks/pkg/reader"
45-
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
4646
ocrtypecodec "github.com/smartcontractkit/chainlink-ccip/pkg/ocrtypecodec/v1"
4747
reader2 "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
4848
"github.com/smartcontractkit/chainlink-ccip/pluginconfig"

0 commit comments

Comments
 (0)