Skip to content

feat: allow for bigger chain ids to be domain id #41

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

Merged
merged 1 commit into from
Feb 25, 2025
Merged

feat: allow for bigger chain ids to be domain id #41

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
6 changes: 3 additions & 3 deletions relayer/message/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ const (

type MessageType string
type Message struct {
Source uint8 // Source where message was initiated
Destination uint8 // Destination chain of message
Source uint64 // Source where message was initiated
Destination uint64 // Destination chain of message
Data interface{} // Data associated with the message
ID string // ID is used to track and identify message across networks
Type MessageType // Message type
Timestamp time.Time //
}

func NewMessage(
source, destination uint8,
source, destination uint64,
data interface{},
id string,
msgType MessageType,
Expand Down
6 changes: 3 additions & 3 deletions relayer/relayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ type MessageTracker interface {
TrackMessages(msgs []*message.Message, status message.MessageStatus)
}

func NewRelayer(chains map[uint8]RelayedChain, messageTracker MessageTracker) *Relayer {
func NewRelayer(chains map[uint64]RelayedChain, messageTracker MessageTracker) *Relayer {
return &Relayer{
relayedChains: chains,
messageTracker: messageTracker,
}
}

type Relayer struct {
relayedChains map[uint8]RelayedChain
relayedChains map[uint64]RelayedChain
messageTracker MessageTracker
}

Expand Down Expand Up @@ -66,7 +66,7 @@ func (r *Relayer) route(msgs []*message.Message) {
r.messageTracker.TrackMessages(msgs, message.PendingMessage)
destChain, ok := r.relayedChains[msgs[0].Destination]
if !ok {
log.Error().Uint8("domainID", msgs[0].Destination).Msgf("No chain registered for destination domain")
log.Error().Uint64("domainID", msgs[0].Destination).Msgf("No chain registered for destination domain")
return
}

Expand Down
12 changes: 6 additions & 6 deletions relayer/relayer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (s *RouteTestSuite) TestStartListensOnChannel() {
return 1
})
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, fmt.Errorf("error"))
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand All @@ -61,7 +61,7 @@ func (s *RouteTestSuite) TestStartListensOnChannel() {
func (s *RouteTestSuite) TestReceiveMessageFails() {
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, fmt.Errorf("error"))
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand All @@ -76,7 +76,7 @@ func (s *RouteTestSuite) TestReceiveMessageFails() {
func (s *RouteTestSuite) TestAvoidWriteWithoutProposals() {
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, nil)
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1))
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand All @@ -95,7 +95,7 @@ func (s *RouteTestSuite) TestWriteFails() {
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(prop, nil)
s.mockRelayedChain.EXPECT().Write(props).Return(fmt.Errorf("error"))
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand All @@ -114,7 +114,7 @@ func (s *RouteTestSuite) TestWritesToChain() {
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(prop, nil)
s.mockRelayedChain.EXPECT().Write(props).Return(nil)
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand All @@ -130,7 +130,7 @@ func (s *RouteTestSuite) Test_Route_ChainDoesNotExist() {
props := make([]*proposal.Proposal, 1)
prop := &proposal.Proposal{}
props[0] = prop
chains := make(map[uint8]RelayedChain)
chains := make(map[uint64]RelayedChain)
chains[1] = s.mockRelayedChain
relayer := NewRelayer(
chains,
Expand Down
Loading