Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use shared RMN protos #535

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1,473
Open

Use shared RMN protos #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion commit/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"github.com/smartcontractkit/chainlink-ccip/commit/committypes"
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot"
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
rmntypes "github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/types"
"github.com/smartcontractkit/chainlink-ccip/commit/tokenprice"
dt "github.com/smartcontractkit/chainlink-ccip/internal/plugincommon/discovery/discoverytypes"
Expand All @@ -35,19 +34,19 @@
func Test_maxQueryLength(t *testing.T) {
// This test will verify that the maxQueryLength constant is set to a proper value.

sigs := make([]*rmnpb.EcdsaSignature, estimatedMaxRmnNodesCount)

Check failure on line 37 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
for i := range sigs {
sigs[i] = &rmnpb.EcdsaSignature{R: make([]byte, 32), S: make([]byte, 32)}

Check failure on line 39 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
}

laneUpdates := make([]*rmnpb.FixedDestLaneUpdate, estimatedMaxNumberOfSourceChains)

Check failure on line 42 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
for i := range laneUpdates {
laneUpdates[i] = &rmnpb.FixedDestLaneUpdate{

Check failure on line 44 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
LaneSource: &rmnpb.LaneSource{

Check failure on line 45 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
SourceChainSelector: math.MaxUint64,
OnrampAddress: make([]byte, 40),
},
ClosedInterval: &rmnpb.ClosedInterval{

Check failure on line 49 in commit/factory_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb (typecheck)
MinMsgNr: math.MaxUint64,
MaxMsgNr: math.MaxUint64,
},
Expand Down
2 changes: 1 addition & 1 deletion commit/merkleroot/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"time"

"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
)

func (p *Processor) Query(ctx context.Context, prevOutcome Outcome) (Query, error) {
Expand Down
2 changes: 1 addition & 1 deletion commit/merkleroot/rmn/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon/consensus"

typconv "github.com/smartcontractkit/chainlink-ccip/internal/libs/typeconv"
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"

"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
rmntypes "github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/types"
"github.com/smartcontractkit/chainlink-ccip/pkg/logutil"
readerpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
Expand Down
1 change: 0 additions & 1 deletion commit/merkleroot/rmn/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"

"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
rmntypes "github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/types"
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
)
Expand All @@ -49,7 +48,7 @@
t *testing.T
rmnController *controller
peerClient *mockPeerClient
updateRequests []*rmnpb.FixedDestLaneUpdateRequest

Check failure on line 51 in commit/merkleroot/rmn/controller_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
rmnHomeMock *readerpkg_mock.MockRMNHome
remoteRMNCfg rmntypes.RemoteConfig
homeF int
Expand All @@ -72,9 +71,9 @@
name: "happy path F+1 observations",
observations: []rmnSignedObservationWithMeta{
{
SignedObservation: &rmnpb.SignedObservation{

Check failure on line 74 in commit/merkleroot/rmn/controller_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
Observation: &rmnpb.Observation{

Check failure on line 75 in commit/merkleroot/rmn/controller_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
FixedDestLaneUpdates: []*rmnpb.FixedDestLaneUpdate{

Check failure on line 76 in commit/merkleroot/rmn/controller_test.go

View workflow job for this annotation

GitHub Actions / build-lint-test 

undefined: rmnpb
{
LaneSource: &rmnpb.LaneSource{SourceChainSelector: uint64(chainS1)},
Root: root1[:],
Expand Down
2 changes: 1 addition & 1 deletion commit/merkleroot/rmn/crypto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"google.golang.org/protobuf/proto"

"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
rmntypes "github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/types"
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
)

// ED25519Verifier is an interface for verifying ED25519 signatures.
Expand Down
2 changes: 1 addition & 1 deletion commit/merkleroot/rmn/crypto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/rmnpb"
rmntypes "github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn/types"
rmnpb "github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go/serialization"
)

var (
Expand Down
Loading
Loading