nit

Signed-off-by: Joshua Kim <[email protected]>
ava-labs · Nov 16, 2023 · 087cf9e · 087cf9e
1 parent 472f525
commit 087cf9e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 22 deletions.
diff --git a/message/inbound_msg_builder.go b/message/inbound_msg_builder.go
@@ -284,11 +284,11 @@ func InboundAppRequest(
 	}
 }
 
-func InboundAppRequestFailed(
+func InboundAppError(
 	nodeID ids.NodeID,
 	chainID ids.ID,
 	requestID uint32,
-	errorCode uint32,
+	errorCode int32,
 	errorMessage string,
 ) InboundMessage {
 	return &inboundMessage{

diff --git a/message/internal_msg_builder.go b/message/internal_msg_builder.go
@@ -412,7 +412,7 @@ type CrossChainAppRequestFailed struct {
 	SourceChainID      ids.ID `json:"source_chain_id,omitempty"`
 	DestinationChainID ids.ID `json:"destination_chain_id,omitempty"`
 	RequestID          uint32 `json:"request_id,omitempty"`
-	ErrorCode          uint32 `json:"error_code,omitempty"`
+	ErrorCode          int32  `json:"error_code,omitempty"`
 	ErrorMessage       string `json:"error_message,omitempty"`
 }
 
@@ -440,7 +440,7 @@ func InternalCrossChainAppRequestFailed(
 	sourceChainID ids.ID,
 	destinationChainID ids.ID,
 	requestID uint32,
-	errorCode uint32,
+	errorCode int32,
 	errorMessage string,
 ) InboundMessage {
 	return &inboundMessage{

diff --git a/network/p2p/router_test.go b/network/p2p/router_test.go
@@ -5,7 +5,6 @@ package p2p
 
 import (
 	"context"
-	"errors"
 	"sync"
 	"testing"
 	"time"
@@ -35,7 +34,10 @@ func TestAppRequestResponse(t *testing.T) {
 	*ctxKey = "foo"
 	*ctxVal = "bar"
 
-	errFoo := errors.New("foo")
+	errFoo := &common.AppError{
+		Code:    0,
+		Message: "foobar",
+	}
 
 	tests := []struct {
 		name        string

diff --git a/proto/pb/vm/vm.pb.go b/proto/pb/vm/vm.pb.go
diff --git a/proto/vm/vm.proto b/proto/vm/vm.proto
@@ -260,7 +260,7 @@ message AppRequestFailedMsg {
   // The ID of the request we sent and didn't get a response to
   uint32 request_id = 2;
   // Application-defined error code
-  uint32 error_code = 3;
+  sint32 error_code = 3;
   // Application-defined error message
   string error_message = 4;
 }
@@ -298,7 +298,7 @@ message CrossChainAppRequestFailedMsg {
   // The ID of the request we sent and didn't get a response to
   uint32 request_id = 2;
   // Application-defined error code
-  uint32 error_code = 3;
+  sint32 error_code = 3;
   // Application-defined error message
   string error_message = 4;
 }

diff --git a/snow/engine/snowman/block/mocks/chain_vm.go b/snow/engine/snowman/block/mocks/chain_vm.go
diff --git a/snow/networking/handler/handler.go b/snow/networking/handler/handler.go
@@ -842,7 +842,7 @@ func (h *handler) executeAsyncMsg(ctx context.Context, msg Message) error {
 	case *p2p.AppResponse:
 		return engine.AppResponse(ctx, nodeID, m.RequestId, m.AppBytes)
 
-	case *p2p.AppRequestFailed:
+	case *p2p.AppError:
 		err := &common.AppError{
 			Code:    m.ErrorCode,
 			Message: m.ErrorMessage,

diff --git a/snow/networking/router/chain_router_test.go b/snow/networking/router/chain_router_test.go
@@ -643,7 +643,7 @@ func TestRouterTimeout(t *testing.T) {
 			ctx.ChainID,
 			requestID,
 			message.AppResponseOp,
-			message.InboundAppRequestFailed(
+			message.InboundAppError(
 				nodeID,
 				ctx.ChainID,
 				requestID,
@@ -1071,7 +1071,7 @@ func TestRouterClearTimeouts(t *testing.T) {
 			ctx.ChainID,
 			requestID,
 			message.AppResponseOp,
-			message.InboundAppRequestFailed(
+			message.InboundAppError(
 				nodeID,
 				ctx.ChainID,
 				requestID,

diff --git a/snow/networking/sender/sender.go b/snow/networking/sender/sender.go
@@ -1264,7 +1264,7 @@ func (s *sender) SendAppRequest(ctx context.Context, nodeIDs set.Set[ids.NodeID]
 	// to send them a message, to avoid busy looping when disconnected from
 	// the internet.
 	for nodeID := range nodeIDs {
-		inMsg := message.InboundAppRequestFailed(
+		inMsg := message.InboundAppError(
 			nodeID,
 			s.ctx.ChainID,
 			requestID,
@@ -1312,7 +1312,7 @@ func (s *sender) SendAppRequest(ctx context.Context, nodeIDs set.Set[ids.NodeID]
 
 			// Immediately register a failure. Do so asynchronously to avoid
 			// deadlock.
-			inMsg := message.InboundAppRequestFailed(
+			inMsg := message.InboundAppError(
 				nodeID,
 				s.ctx.ChainID,
 				requestID,
@@ -1372,7 +1372,7 @@ func (s *sender) SendAppRequest(ctx context.Context, nodeIDs set.Set[ids.NodeID]
 
 			// Register failures for nodes we didn't send a request to.
 			s.timeouts.RegisterRequestToUnreachableValidator()
-			inMsg := message.InboundAppRequestFailed(
+			inMsg := message.InboundAppError(
 				nodeID,
 				s.ctx.ChainID,
 				requestID,

diff --git a/vms/rpcchainvm/vm_client.go b/vms/rpcchainvm/vm_client.go
@@ -598,7 +598,7 @@ func (vm *VMClient) AppRequestFailed(ctx context.Context, nodeID ids.NodeID, req
 		ErrorMessage: appErr.Message,
 	}
 
-	_, err = vm.client.AppRequestFailed(ctx, msg)
+	_, err := vm.client.AppRequestFailed(ctx, msg)
 	return err
 }