Skip to content

Commit

Permalink
when conn==nil, init client to "empty" impl
Browse files Browse the repository at this point in the history
addresses review comment ava-labs/awm-relayer#344 (comment)
  • Loading branch information
feuGeneA committed Jul 26, 2024
1 parent f80c007 commit bef4ddc
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions messages/teleporter/message_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"context"
"encoding/json"
"fmt"
"reflect"
"time"

"github.com/ava-labs/avalanchego/ids"
Expand Down Expand Up @@ -45,6 +44,17 @@ type messageHandler struct {
deciderClient pbDecider.DeciderServiceClient
}

// define an "empty" decider client to use when a connection isn't provided:
type emptyDeciderClient struct{}

func (s *emptyDeciderClient) ShouldSendMessage(
_ context.Context,
_ *pbDecider.ShouldSendMessageRequest,
_ ...grpc.CallOption,
) (*pbDecider.ShouldSendMessageResponse, error) {
return &pbDecider.ShouldSendMessageResponse{ShouldSendMessage: true}, nil
}

func NewMessageHandlerFactory(
logger logging.Logger,
messageProtocolAddress common.Address,
Expand Down Expand Up @@ -72,7 +82,9 @@ func NewMessageHandlerFactory(
}

var deciderClient pbDecider.DeciderServiceClient
if deciderClientConn != nil {
if deciderClientConn == nil {
deciderClient = &emptyDeciderClient{}
} else {
deciderClient = pbDecider.NewDeciderServiceClient(deciderClientConn)
}

Expand Down Expand Up @@ -204,12 +216,6 @@ func (m *messageHandler) ShouldSendMessage(destinationClient vms.DestinationClie
// Queries the decider service to determine whether this message should be
// sent. If the decider client is nil, returns true.
func (m *messageHandler) getShouldSendMessageFromDecider() (bool, error) {
deciderClientValue := reflect.ValueOf(m.deciderClient)

if !deciderClientValue.IsValid() || deciderClientValue.IsNil() {
return true, nil
}

warpMsgID := m.unsignedMessage.ID()

ctx, cancelCtx := context.WithTimeout(context.Background(), 30*time.Second)
Expand Down

0 comments on commit bef4ddc

Please sign in to comment.