chore(data-proxy): clean up proto annotations

Part-of: #316
sedaprotocol · Aug 22, 2024 · 47f26fd · 47f26fd
1 parent 2403bf4
commit 47f26fd
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 104 deletions.
diff --git a/proto/sedachain/data_proxy/v1/data_proxy.proto b/proto/sedachain/data_proxy/v1/data_proxy.proto
@@ -33,14 +33,14 @@ message ProxyConfig {
 
   // fee_update defines an upcoming fee change which will take effect at a
   // future height.
-  FeeUpdate fee_update = 5 [ (gogoproto.nullable) = true ];
+  FeeUpdate fee_update = 5;
 }
 
 // FeeUpdate defines a new fee amount and the height at which it will take
 // effect.
 message FeeUpdate {
   // new_fee defines the new fee for the data proxy.
-  cosmos.base.v1beta1.Coin new_fee = 1 [ (gogoproto.nullable) = false ];
+  cosmos.base.v1beta1.Coin new_fee = 1;
 
   // update_height defines the height after which the new fee comes into effect.
   int64 update_height = 2;

diff --git a/proto/sedachain/data_proxy/v1/tx.proto b/proto/sedachain/data_proxy/v1/tx.proto
@@ -66,7 +66,7 @@ message MsgEditDataProxy {
 
   string new_memo = 3;
 
-  cosmos.base.v1beta1.Coin new_fee = 4 [ (gogoproto.nullable) = true ];
+  cosmos.base.v1beta1.Coin new_fee = 4;
 
   // 0 will default to the minimum delay configured in the params
   uint32 fee_update_delay = 5;

diff --git a/x/data-proxy/keeper/abci.go b/x/data-proxy/keeper/abci.go
@@ -41,7 +41,7 @@ func (k *Keeper) ProcessFeeUpdates(ctx sdk.Context) error {
 			return err
 		}
 
-		proxyConfig.Fee = &proxyConfig.FeeUpdate.NewFee
+		proxyConfig.Fee = proxyConfig.FeeUpdate.NewFee
 		proxyConfig.FeeUpdate = nil
 
 		if err := k.DataProxyConfigs.Set(ctx, pubkey, proxyConfig); err != nil {

diff --git a/x/data-proxy/keeper/genesis_test.go b/x/data-proxy/keeper/genesis_test.go
@@ -34,7 +34,7 @@ func (s *KeeperTestSuite) TestImportExportGenesis() {
 					Fee:           s.NewFeeFromString("5000"),
 					Memo:          "not my proxy friend",
 					FeeUpdate: &types.FeeUpdate{
-						NewFee:       *s.NewFeeFromString("10000"),
+						NewFee:       s.NewFeeFromString("10000"),
 						UpdateHeight: 500,
 					},
 				},

diff --git a/x/data-proxy/keeper/grpc_query_test.go b/x/data-proxy/keeper/grpc_query_test.go
@@ -38,7 +38,7 @@ func (s *KeeperTestSuite) TestQuerier_ProxyConfig() {
 				Fee:           &sdk.Coin{Denom: "aseda", Amount: math.NewInt(5)},
 				Memo:          "",
 				FeeUpdate: &types.FeeUpdate{
-					NewFee:       sdk.Coin{Denom: "aseda", Amount: math.NewInt(10)},
+					NewFee:       &sdk.Coin{Denom: "aseda", Amount: math.NewInt(10)},
 					UpdateHeight: 6,
 				},
 			},

diff --git a/x/data-proxy/keeper/keeper.go b/x/data-proxy/keeper/keeper.go
@@ -88,7 +88,7 @@ func (k Keeper) processProxyFeeUpdate(ctx sdk.Context, pubKeyBytes []byte, proxy
 	// Determine update height
 	updateHeight := ctx.BlockHeight() + int64(updateDelay)
 	feeUpdate := &types.FeeUpdate{
-		NewFee:       *newFee,
+		NewFee:       newFee,
 		UpdateHeight: updateHeight,
 	}
 

diff --git a/x/data-proxy/keeper/keeper_test.go b/x/data-proxy/keeper/keeper_test.go
@@ -23,7 +23,7 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() {
 			Memo:          "test",
 			FeeUpdate: &types.FeeUpdate{
 				UpdateHeight: 0,
-				NewFee:       *s.NewFeeFromString("987654321"),
+				NewFee:       s.NewFeeFromString("987654321"),
 			},
 			AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5",
 		})
@@ -77,7 +77,7 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() {
 				Memo:          "test",
 				FeeUpdate: &types.FeeUpdate{
 					UpdateHeight: updateHeight,
-					NewFee:       *s.NewFeeFromString("30"),
+					NewFee:       s.NewFeeFromString("30"),
 				},
 				AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5",
 			})
@@ -99,12 +99,12 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() {
 				Memo:          "test",
 				FeeUpdate: &types.FeeUpdate{
 					UpdateHeight: 1,
-					NewFee:       *s.NewFeeFromString("30"),
+					NewFee:       s.NewFeeFromString("30"),
 				},
 				AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5",
 			}
 			if i < 5 {
-				expected.Fee = &expected.FeeUpdate.NewFee
+				expected.Fee = expected.FeeUpdate.NewFee
 				expected.FeeUpdate = nil
 			}
 
@@ -138,12 +138,12 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() {
 				Memo:          "test",
 				FeeUpdate: &types.FeeUpdate{
 					UpdateHeight: 1,
-					NewFee:       *s.NewFeeFromString("30"),
+					NewFee:       s.NewFeeFromString("30"),
 				},
 				AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5",
 			}
 
-			expected.Fee = &expected.FeeUpdate.NewFee
+			expected.Fee = expected.FeeUpdate.NewFee
 			expected.FeeUpdate = nil
 
 			s.Require().Equal(expected, proxyConfig)

diff --git a/x/data-proxy/keeper/msg_server_test.go b/x/data-proxy/keeper/msg_server_test.go
@@ -252,7 +252,7 @@ func (s *KeeperTestSuite) TestMsgServer_EditDataProxy() {
 				Fee:           s.NewFeeFromString("9"),
 				Memo:          "test",
 				FeeUpdate: &types.FeeUpdate{
-					NewFee: *s.NewFeeFromString("1337"),
+					NewFee: s.NewFeeFromString("1337"),
 					// Height in test is 0, so update height should be minimum
 					UpdateHeight: int64(types.DefaultMinFeeUpdateDelay),
 				},
@@ -275,7 +275,7 @@ func (s *KeeperTestSuite) TestMsgServer_EditDataProxy() {
 				Fee:           s.NewFeeFromString("9"),
 				Memo:          "test",
 				FeeUpdate: &types.FeeUpdate{
-					NewFee:       *s.NewFeeFromString("1337"),
+					NewFee:       s.NewFeeFromString("1337"),
 					UpdateHeight: int64(types.DefaultMinFeeUpdateDelay + 100),
 				},
 				AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5",

diff --git a/x/data-proxy/types/data_proxy.pb.go b/x/data-proxy/types/data_proxy.pb.go