delete CHAIN_TYPE prefix from batch info chain type (#128)

initia-labs · Dec 17, 2024 · 7da22a7 · 7da22a7
1 parent 3ed9c06
commit 7da22a7
Show file tree

Hide file tree

Showing 19 changed files with 187 additions and 212 deletions.
diff --git a/api/opinit/ophost/v1/types.pulsar.go b/api/opinit/ophost/v1/types.pulsar.go
diff --git a/contrib/launchtools/config.go b/contrib/launchtools/config.go
@@ -137,16 +137,16 @@ func (opBridge *OpBridge) Finalize(buf *bufio.Reader) error {
 		opBridge.OutputSubmissionStartHeight = 1
 	}
 
-	if opBridge.BatchSubmissionTarget == ophosttypes.BatchInfo_CHAIN_TYPE_UNSPECIFIED {
+	if opBridge.BatchSubmissionTarget == ophosttypes.BatchInfo_UNSPECIFIED {
 		useCelestia, err := input.GetConfirmation("Use Celestia as DA layer?", buf, os.Stderr)
 		if err != nil {
 			return err
 		}
 
 		if useCelestia {
-			opBridge.BatchSubmissionTarget = ophosttypes.BatchInfo_CHAIN_TYPE_CELESTIA
+			opBridge.BatchSubmissionTarget = ophosttypes.BatchInfo_CELESTIA
 		} else {
-			opBridge.BatchSubmissionTarget = ophosttypes.BatchInfo_CHAIN_TYPE_INITIA
+			opBridge.BatchSubmissionTarget = ophosttypes.BatchInfo_INITIA
 		}
 	}
 

diff --git a/contrib/launchtools/config_test.go b/contrib/launchtools/config_test.go
@@ -17,7 +17,7 @@ func Test_opBridgeConfig_JSON(t *testing.T) {
 		OutputSubmissionInterval:    &submissionInterval,
 		OutputFinalizationPeriod:    &finalizationPeriod,
 		OutputSubmissionStartHeight: 1,
-		BatchSubmissionTarget:       ophosttypes.BatchInfo_CHAIN_TYPE_CELESTIA,
+		BatchSubmissionTarget:       ophosttypes.BatchInfo_CELESTIA,
 	}
 
 	bz, err := json.Marshal(opBridgeConfig)

diff --git a/contrib/launchtools/utils/address.go b/contrib/launchtools/utils/address.go
@@ -47,9 +47,9 @@ func DeriveL2Address(mnemonic string) (string, error) {
 func DeriveDAAddress(mnemonic string, chainType ophosttypes.BatchInfo_ChainType) (string, error) {
 	var codec address.Codec
 	switch chainType {
-	case ophosttypes.BatchInfo_CHAIN_TYPE_INITIA:
+	case ophosttypes.BatchInfo_INITIA:
 		codec = L1AddressCodec()
-	case ophosttypes.BatchInfo_CHAIN_TYPE_CELESTIA:
+	case ophosttypes.BatchInfo_CELESTIA:
 		codec = CelestiaAddressCodec()
 	default:
 		return "", errors.New("unsupported chain type")

diff --git a/proto/opinit/ophost/v1/types.proto b/proto/opinit/ophost/v1/types.proto
@@ -67,11 +67,11 @@ message BatchInfo {
   // ChainType defines the type of chain.
   enum ChainType {
     // Unspecified chain type.
-    CHAIN_TYPE_UNSPECIFIED = 0;
+    UNSPECIFIED = 0;
     // The chain type of the initia chain.
-    CHAIN_TYPE_INITIA = 1;
+    INITIA = 1;
     // The chain type of the celestia chain.
-    CHAIN_TYPE_CELESTIA = 2;
+    CELESTIA = 2;
   }
 
   // The address of the batch submitter.

diff --git a/x/opchild/keeper/genesis_test.go b/x/opchild/keeper/genesis_test.go
@@ -41,7 +41,7 @@ func Test_GenesisImportExport(t *testing.T) {
 			Proposer:   addrsStr[3],
 			BatchInfo: ophosttypes.BatchInfo{
 				Submitter: addrsStr[4],
-				ChainType: ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+				ChainType: ophosttypes.BatchInfo_INITIA,
 			},
 			SubmissionInterval:    time.Minute,
 			FinalizationPeriod:    time.Hour,

diff --git a/x/opchild/keeper/msg_server_test.go b/x/opchild/keeper/msg_server_test.go
@@ -292,7 +292,7 @@ func Test_MsgServer_Withdraw(t *testing.T) {
 			Proposer:   addrsStr[3],
 			BatchInfo: ophosttypes.BatchInfo{
 				Submitter: addrsStr[4],
-				ChainType: ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+				ChainType: ophosttypes.BatchInfo_INITIA,
 			},
 			SubmissionInterval:    time.Minute,
 			FinalizationPeriod:    time.Hour,
@@ -344,7 +344,7 @@ func Test_MsgServer_SetBridgeInfo(t *testing.T) {
 			Proposer:   addrsStr[3],
 			BatchInfo: ophosttypes.BatchInfo{
 				Submitter: addrsStr[4],
-				ChainType: ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+				ChainType: ophosttypes.BatchInfo_INITIA,
 			},
 			SubmissionInterval:    time.Minute,
 			FinalizationPeriod:    time.Hour,

diff --git a/x/opchild/keeper/querier_test.go b/x/opchild/keeper/querier_test.go
@@ -60,7 +60,7 @@ func Test_QuerySetBridgeInfo(t *testing.T) {
 			Proposer:   addrsStr[3],
 			BatchInfo: ophosttypes.BatchInfo{
 				Submitter: addrsStr[4],
-				ChainType: ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+				ChainType: ophosttypes.BatchInfo_INITIA,
 			},
 			SubmissionInterval:    time.Minute,
 			FinalizationPeriod:    time.Hour,

diff --git a/x/ophost/keeper/batch_info_test.go b/x/ophost/keeper/batch_info_test.go
@@ -12,7 +12,7 @@ func Test_SetGetBatchInfo(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 	batchInfo1 := types.BatchInfo{
 		Submitter: addrsStr[0],
-		ChainType: types.BatchInfo_CHAIN_TYPE_INITIA,
+		ChainType: types.BatchInfo_INITIA,
 	}
 	output1 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
@@ -25,7 +25,7 @@ func Test_SetGetBatchInfo(t *testing.T) {
 
 	batchInfo2 := types.BatchInfo{
 		Submitter: addrsStr[1],
-		ChainType: types.BatchInfo_CHAIN_TYPE_INITIA,
+		ChainType: types.BatchInfo_INITIA,
 	}
 	output2 := types.Output{
 		OutputRoot:    []byte{4, 5, 6},
@@ -38,7 +38,7 @@ func Test_SetGetBatchInfo(t *testing.T) {
 
 	batchInfo3 := types.BatchInfo{
 		Submitter: addrsStr[0],
-		ChainType: types.BatchInfo_CHAIN_TYPE_CELESTIA,
+		ChainType: types.BatchInfo_CELESTIA,
 	}
 	output3 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
@@ -51,7 +51,7 @@ func Test_SetGetBatchInfo(t *testing.T) {
 
 	batchInfo4 := types.BatchInfo{
 		Submitter: addrsStr[1],
-		ChainType: types.BatchInfo_CHAIN_TYPE_CELESTIA,
+		ChainType: types.BatchInfo_CELESTIA,
 	}
 	output4 := types.Output{
 		OutputRoot:    []byte{4, 5, 6},
@@ -64,7 +64,7 @@ func Test_SetGetBatchInfo(t *testing.T) {
 
 	batchInfo5 := types.BatchInfo{
 		Submitter: addrsStr[1],
-		ChainType: types.BatchInfo_CHAIN_TYPE_CELESTIA,
+		ChainType: types.BatchInfo_CELESTIA,
 	}
 	output5 := types.Output{
 		OutputRoot:    []byte{4, 5, 6},

diff --git a/x/ophost/keeper/bridge_test.go b/x/ophost/keeper/bridge_test.go
@@ -17,7 +17,7 @@ func Test_BridgeConfig(t *testing.T) {
 		FinalizationPeriod:    time.Second * 10,
 		SubmissionStartHeight: 1,
 		Metadata:              []byte{1, 2, 3},
-		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_CHAIN_TYPE_INITIA},
+		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_INITIA},
 	}
 	require.NoError(t, input.OPHostKeeper.SetBridgeConfig(ctx, 1, config))
 	_config, err := input.OPHostKeeper.GetBridgeConfig(ctx, 1)
@@ -34,7 +34,7 @@ func Test_IterateBridgeConfig(t *testing.T) {
 		FinalizationPeriod:    time.Second * 10,
 		SubmissionStartHeight: 1,
 		Metadata:              []byte{1, 2, 3},
-		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_CHAIN_TYPE_INITIA},
+		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_INITIA},
 	}
 	config2 := types.BridgeConfig{
 		Challenger:            addrs[2].String(),
@@ -43,7 +43,7 @@ func Test_IterateBridgeConfig(t *testing.T) {
 		FinalizationPeriod:    time.Second * 10,
 		SubmissionStartHeight: 1,
 		Metadata:              []byte{3, 4, 5},
-		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_CHAIN_TYPE_INITIA},
+		BatchInfo:             types.BatchInfo{Submitter: addrsStr[0], ChainType: types.BatchInfo_INITIA},
 	}
 	require.NoError(t, input.OPHostKeeper.SetBridgeConfig(ctx, 1, config1))
 	require.NoError(t, input.OPHostKeeper.SetBridgeConfig(ctx, 2, config2))