improve readbility of decider invocation

addresses review comments ava-labs/icm-services#344 (comment) and ava-labs/icm-services#344 (comment) and ava-labs/icm-services#344 (comment)
avalabsorg · Jul 24, 2024 · bfa6e14 · bfa6e14
1 parent 9271981
commit bfa6e14
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/messages/teleporter/message_handler.go b/messages/teleporter/message_handler.go
@@ -183,31 +183,32 @@ func (m *messageHandler) ShouldSendMessage(destinationClient vms.DestinationClie
 		return false, nil
 	}
 
-	deciderRejectedMsg, err := m.deciderRejectedMessage()
-	if err != nil {
+	if decision, err := m.getDeciderDecision(); err != nil {
 		m.logger.Warn(
 			"Error delegating to decider",
 			zap.String("warpMessageID", m.unsignedMessage.ID().String()),
 			zap.String("teleporterMessageID", teleporterMessageID.String()),
 		)
-	}
-	if deciderRejectedMsg {
-		m.logger.Info(
-			"Decider rejected message",
-			zap.String("warpMessageID", m.unsignedMessage.ID().String()),
-			zap.String("teleporterMessageID", teleporterMessageID.String()),
-			zap.String("destinationBlockchainID", destinationBlockchainID.String()),
-		)
+	} else if decision != nil {
+		if !*decision {
+			m.logger.Info(
+				"Decider rejected message",
+				zap.String("warpMessageID", m.unsignedMessage.ID().String()),
+				zap.String("teleporterMessageID", teleporterMessageID.String()),
+				zap.String("destinationBlockchainID", destinationBlockchainID.String()),
+			)
+		}
+		return *decision, nil
 	}
 
 	return true, nil
 }
 
-func (m *messageHandler) deciderRejectedMessage() (bool, error) {
+func (m *messageHandler) getDeciderDecision() (*bool, error) {
 	deciderClientValue := reflect.ValueOf(m.deciderClient)
 
 	if !deciderClientValue.IsValid() || deciderClientValue.IsNil() {
-		return false, nil
+		return nil, nil
 	}
 
 	warpMsgIDStr := m.unsignedMessage.ID().Hex()
@@ -219,7 +220,7 @@ func (m *messageHandler) deciderRejectedMessage() (bool, error) {
 			zap.String("warpMsgIDStr", warpMsgIDStr),
 			zap.Error(err),
 		)
-		return false, err
+		return nil, err
 	}
 
 	ctx, cancelCtx := context.WithTimeout(context.Background(), 30*time.Second)
@@ -236,10 +237,10 @@ func (m *messageHandler) deciderRejectedMessage() (bool, error) {
 	)
 	if err != nil {
 		m.logger.Error("Error response from decider.", zap.Error(err))
-		return false, err
+		return nil, err
 	}
 
-	return !response.ShouldSendMessage, nil
+	return &response.ShouldSendMessage, nil
 }
 
 // SendMessage extracts the gasLimit and packs the call data to call the receiveCrossChainMessage