Revert introducing a common Type proto message

dymensionxyz · May 27, 2024 · e46f5f2 · e46f5f2
1 parent 8ffd74e
commit e46f5f2
Show file tree

Hide file tree

Showing 19 changed files with 188 additions and 239 deletions.
diff --git a/proto/dymension/common/rollapp_packet.proto b/proto/dymension/common/rollapp_packet.proto
@@ -4,7 +4,6 @@ package dymensionxyz.dymension.common;
 import "gogoproto/gogo.proto";
 import "ibc/core/channel/v1/channel.proto"; 
 import "dymension/common/status.proto";
-import "dymension/common/type.proto";
 
 option go_package = "github.com/dymensionxyz/dymension/v3/x/common/types";
 
@@ -15,6 +14,12 @@ message RollappPacket {
     Status status = 4;
     uint64 ProofHeight = 5;
     bytes relayer = 6;
+    enum Type {
+      ON_RECV = 0;
+      ON_ACK = 1;
+      ON_TIMEOUT = 2;
+      UNDEFINED = -1;
+    }
     Type type = 7;
     // stores the result of onAck, onTimeout or onRecv/writeAck
     string error = 8;

diff --git a/proto/dymension/common/type.proto b/proto/dymension/common/type.proto
diff --git a/proto/dymension/delayedack/query.proto b/proto/dymension/delayedack/query.proto
@@ -6,7 +6,6 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "dymension/delayedack/params.proto";
 import "dymension/common/status.proto";
-import "dymension/common/type.proto";
 import "dymension/common/rollapp_packet.proto";
 
 option go_package = "github.com/dymensionxyz/dymension/v3/x/delayedack/types";
@@ -36,7 +35,7 @@ message QueryParamsResponse {
 message QueryRollappPacketsRequest {
 	string rollappId = 1;
 	common.Status status = 2;
-	common.Type type = 3;
+	common.RollappPacket.Type type = 3;
 	cosmos.base.query.v1beta1.PageRequest pagination = 4;
 }
 

diff --git a/x/common/types/packet_uid.go b/x/common/types/packet_uid.go
@@ -4,14 +4,14 @@ import "fmt"
 
 // PacketUID is a unique identifier for an Rollapp IBC packet on the hub
 type PacketUID struct {
-	Type              Type
+	Type              RollappPacket_Type
 	RollappHubPort    string
 	RollappHubChannel string
 	Sequence          uint64
 }
 
 // NewPacketUID creates a new PacketUID with the provided details.
-func NewPacketUID(packetType Type, hubPort string, hubChannel string, sequence uint64) PacketUID {
+func NewPacketUID(packetType RollappPacket_Type, hubPort string, hubChannel string, sequence uint64) PacketUID {
 	return PacketUID{
 		Type:              packetType,
 		RollappHubPort:    hubPort,

diff --git a/x/common/types/rollapp_packet.go b/x/common/types/rollapp_packet.go
@@ -40,9 +40,9 @@ func (r RollappPacket) RestoreOriginalTransferTarget() (RollappPacket, error) {
 	}
 	if r.OriginalTransferTarget != "" { // It can be empty if the eibc order was never fulfilled
 		switch r.Type {
-		case Type_ON_RECV:
+		case RollappPacket_ON_RECV:
 			transferPacketData.Receiver = r.OriginalTransferTarget
-		case Type_ON_ACK, Type_ON_TIMEOUT:
+		case RollappPacket_ON_ACK, RollappPacket_ON_TIMEOUT:
 			transferPacketData.Sender = r.OriginalTransferTarget
 		}
 		r.Packet.Data = transferPacketData.GetBytes()

diff --git a/x/common/types/rollapp_packet.pb.go b/x/common/types/rollapp_packet.pb.go
diff --git a/x/common/types/type.pb.go b/x/common/types/type.pb.go
diff --git a/x/delayedack/client/cli/query.go b/x/delayedack/client/cli/query.go
@@ -78,8 +78,8 @@ func CmdGetPacketsByRollapp() *cobra.Command {
 
 			req := &types.QueryRollappPacketsRequest{
 				RollappId: rollappId,
-				Status:    commontypes.Status_PENDING, // get pending packets by default
-				Type:      commontypes.Type_UNDEFINED, // must specify, as '0' is a valid type
+				Status:    commontypes.Status_PENDING,          // get pending packets by default
+				Type:      commontypes.RollappPacket_UNDEFINED, // must specify, as '0' is a valid type
 			}
 
 			if len(args) > 1 {
@@ -97,12 +97,12 @@ func CmdGetPacketsByRollapp() *cobra.Command {
 				if !strings.HasPrefix(typeStr, "ON_") {
 					typeStr = "ON_" + typeStr
 				}
-				dtype, ok := commontypes.Type_value[typeStr]
+				dtype, ok := commontypes.RollappPacket_Type_value[typeStr]
 				if !ok {
 					// Handle error: typeStr is not a valid commontypes.Type
 					return fmt.Errorf("invalid type: %s", typeStr)
 				}
-				req.Type = commontypes.Type(dtype)
+				req.Type = commontypes.RollappPacket_Type(dtype)
 			}
 
 			res, err := queryClient.GetPackets(cmd.Context(), req)
@@ -140,19 +140,19 @@ func CmdGetPacketsByStatus() *cobra.Command {
 
 			req := &types.QueryRollappPacketsRequest{
 				Status: commontypes.Status(status),
-				Type:   commontypes.Type_UNDEFINED, // must specify, as '0' is a valid type
+				Type:   commontypes.RollappPacket_UNDEFINED, // must specify, as '0' is a valid type
 			}
 
 			if len(args) > 1 {
 				typeStr := strings.ToUpper(args[1])
 				if !strings.HasPrefix(typeStr, "ON_") {
 					typeStr = "ON_" + typeStr
 				}
-				dtype, ok := commontypes.Type_value[typeStr]
+				dtype, ok := commontypes.RollappPacket_Type_value[typeStr]
 				if !ok {
 					return fmt.Errorf("invalid type: %s", typeStr)
 				}
-				req.Type = commontypes.Type(dtype)
+				req.Type = commontypes.RollappPacket_Type(dtype)
 			}
 
 			res, err := queryClient.GetPackets(cmd.Context(), req)
@@ -188,13 +188,13 @@ func CmdGetPacketsByType() *cobra.Command {
 				typeStr = "ON_" + typeStr
 			}
 
-			dtype, ok := commontypes.Type_value[typeStr]
+			dtype, ok := commontypes.RollappPacket_Type_value[typeStr]
 			if !ok {
 				return fmt.Errorf("invalid type: %s", typeStr)
 			}
 
 			req := &types.QueryRollappPacketsRequest{
-				Type:   commontypes.Type(dtype),
+				Type:   commontypes.RollappPacket_Type(dtype),
 				Status: commontypes.Status_PENDING, // get pending packets by default
 			}