Skip to content

Commit bce7607

Browse files
authored
feat: allow for bigger chain ids to be domain id (#41)
1 parent 2c5597a commit bce7607

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

relayer/message/message.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ const (
1212

1313
type MessageType string
1414
type Message struct {
15-
Source uint8 // Source where message was initiated
16-
Destination uint8 // Destination chain of message
15+
Source uint64 // Source where message was initiated
16+
Destination uint64 // Destination chain of message
1717
Data interface{} // Data associated with the message
1818
ID string // ID is used to track and identify message across networks
1919
Type MessageType // Message type
2020
Timestamp time.Time //
2121
}
2222

2323
func NewMessage(
24-
source, destination uint8,
24+
source, destination uint64,
2525
data interface{},
2626
id string,
2727
msgType MessageType,

relayer/relayer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ type MessageTracker interface {
2727
TrackMessages(msgs []*message.Message, status message.MessageStatus)
2828
}
2929

30-
func NewRelayer(chains map[uint8]RelayedChain, messageTracker MessageTracker) *Relayer {
30+
func NewRelayer(chains map[uint64]RelayedChain, messageTracker MessageTracker) *Relayer {
3131
return &Relayer{
3232
relayedChains: chains,
3333
messageTracker: messageTracker,
3434
}
3535
}
3636

3737
type Relayer struct {
38-
relayedChains map[uint8]RelayedChain
38+
relayedChains map[uint64]RelayedChain
3939
messageTracker MessageTracker
4040
}
4141

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

relayer/relayer_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (s *RouteTestSuite) TestStartListensOnChannel() {
4343
return 1
4444
})
4545
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, fmt.Errorf("error"))
46-
chains := make(map[uint8]RelayedChain)
46+
chains := make(map[uint64]RelayedChain)
4747
chains[1] = s.mockRelayedChain
4848
relayer := NewRelayer(
4949
chains,
@@ -61,7 +61,7 @@ func (s *RouteTestSuite) TestStartListensOnChannel() {
6161
func (s *RouteTestSuite) TestReceiveMessageFails() {
6262
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
6363
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, fmt.Errorf("error"))
64-
chains := make(map[uint8]RelayedChain)
64+
chains := make(map[uint64]RelayedChain)
6565
chains[1] = s.mockRelayedChain
6666
relayer := NewRelayer(
6767
chains,
@@ -76,7 +76,7 @@ func (s *RouteTestSuite) TestReceiveMessageFails() {
7676
func (s *RouteTestSuite) TestAvoidWriteWithoutProposals() {
7777
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(nil, nil)
7878
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1))
79-
chains := make(map[uint8]RelayedChain)
79+
chains := make(map[uint64]RelayedChain)
8080
chains[1] = s.mockRelayedChain
8181
relayer := NewRelayer(
8282
chains,
@@ -95,7 +95,7 @@ func (s *RouteTestSuite) TestWriteFails() {
9595
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(prop, nil)
9696
s.mockRelayedChain.EXPECT().Write(props).Return(fmt.Errorf("error"))
9797
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
98-
chains := make(map[uint8]RelayedChain)
98+
chains := make(map[uint64]RelayedChain)
9999
chains[1] = s.mockRelayedChain
100100
relayer := NewRelayer(
101101
chains,
@@ -114,7 +114,7 @@ func (s *RouteTestSuite) TestWritesToChain() {
114114
s.mockRelayedChain.EXPECT().ReceiveMessage(gomock.Any()).Return(prop, nil)
115115
s.mockRelayedChain.EXPECT().Write(props).Return(nil)
116116
s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(1)
117-
chains := make(map[uint8]RelayedChain)
117+
chains := make(map[uint64]RelayedChain)
118118
chains[1] = s.mockRelayedChain
119119
relayer := NewRelayer(
120120
chains,
@@ -130,7 +130,7 @@ func (s *RouteTestSuite) Test_Route_ChainDoesNotExist() {
130130
props := make([]*proposal.Proposal, 1)
131131
prop := &proposal.Proposal{}
132132
props[0] = prop
133-
chains := make(map[uint8]RelayedChain)
133+
chains := make(map[uint64]RelayedChain)
134134
chains[1] = s.mockRelayedChain
135135
relayer := NewRelayer(
136136
chains,

0 commit comments

Comments
 (0)