refactor: use snake case fields with proto message fields (#822)

elys-network · Sep 25, 2024 · a2442f8 · a2442f8
1 parent 89813ae
commit a2442f8
Show file tree

Hide file tree

Showing 21 changed files with 524 additions and 515 deletions.
diff --git a/proto/elys/amm/types.proto b/proto/elys/amm/types.proto
@@ -9,11 +9,11 @@ import "cosmos/base/v1beta1/coin.proto";
 option go_package = "github.com/elys-network/elys/x/amm/types";
 
 enum FilterType {
-    FilterAll           = 0;
-    FilterPerpetual     = 1;
-    FilterFixedWeight   = 2;
-    FilterDynamicWeight = 3;
-	FilterLeverage      = 4;
+    FILTER_ALL           = 0;
+    FILTER_PERPETUAL     = 1;
+    FILTER_FIXED_WEIGHT   = 2;
+    FILTER_DYNAMIC_WEIGHT = 3;
+	FILTER_LEVERAGE      = 4;
 }
 
 message QueryEarnPoolRequest {

diff --git a/proto/elys/assetprofile/add_entry.proto b/proto/elys/assetprofile/add_entry.proto
@@ -6,24 +6,24 @@ option go_package = "github.com/elys-network/elys/x/assetprofile/types";
 
 message MsgAddEntry {
            string creator                  =  1;
-           string baseDenom                =  2;
+           string base_denom                =  2;
            uint64 decimals                 =  3;
            string denom                    =  4;
            string path                     =  5;
-           string ibcChannelId             =  6;
-           string ibcCounterpartyChannelId =  7;
-           string displayName              =  8;
-           string displaySymbol            =  9;
+           string ibc_channel_id             =  6;
+           string ibc_counterparty_channel_id =  7;
+           string display_name              =  8;
+           string display_symbol            =  9;
            string network                  = 10;
            string address                  = 11;
-           string externalSymbol           = 12;
-           string transferLimit            = 13;
+           string external_symbol           = 12;
+           string transfer_limit            = 13;
   repeated string permissions              = 14;
-           string unitDenom                = 15;
-           string ibcCounterpartyDenom     = 16;
-           string ibcCounterpartyChainId   = 17;
-           bool   commitEnabled            = 18;
-           bool   withdrawEnabled          = 19;
+           string unit_denom                = 15;
+           string ibc_counterparty_denom     = 16;
+           string ibc_counterparty_chain_id   = 17;
+           bool   commit_enabled            = 18;
+           bool   withdraw_enabled          = 19;
 }
 
 message MsgAddEntryResponse {}
diff --git a/proto/elys/commitment/query.proto b/proto/elys/commitment/query.proto
@@ -95,7 +95,7 @@ message QueryCommitmentVestingInfoResponse {
 
 message VestingDetails {
     string id = 1;
-    string totalVesting = 2 [
+    string total_vesting = 2 [
         (cosmos_proto.scalar)  = "cosmos.Int",
         (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
         (gogoproto.nullable)   = false
@@ -105,7 +105,7 @@ message VestingDetails {
         (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
         (gogoproto.nullable)   = false
     ];
-    string vestedSoFar = 4 [
+    string vested_so_far = 4 [
         (cosmos_proto.scalar)  = "cosmos.Int",
         (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
         (gogoproto.nullable)   = false

diff --git a/proto/elys/leveragelp/tx.proto b/proto/elys/leveragelp/tx.proto
@@ -71,7 +71,7 @@ message UpdatePool {
 
 message MsgUpdatePool {
   string     authority = 1;
-  UpdatePool UpdatePool = 2;
+  UpdatePool update_pool = 2;
 }
 
 message MsgUpdatePoolResponse {}

diff --git a/proto/elys/oracle/tx.proto b/proto/elys/oracle/tx.proto
@@ -96,8 +96,8 @@ message MsgCreateAssetInfo {
   string creator    = 1;
   string denom      = 2;
   string display    = 3;
-  string bandTicker = 4;
-  string elysTicker = 5;
+  string band_ticker = 4;
+  string elys_ticker = 5;
   uint64 decimal    = 6;
 }
 

diff --git a/proto/elys/parameter/tx.proto b/proto/elys/parameter/tx.proto
@@ -60,7 +60,7 @@ message MsgUpdateWasmConfigResponse {}
 
 message MsgUpdateRewardsDataLifetime {
   string creator             = 1;
-  string rewardsDataLifetime = 2;
+  string rewards_data_lifetime = 2;
 }
 
 message MsgUpdateRewardsDataLifetimeResponse {}

diff --git a/proto/elys/tier/genesis.proto b/proto/elys/tier/genesis.proto
@@ -11,6 +11,6 @@ option go_package = "github.com/elys-network/elys/x/tier/types";
 // GenesisState defines the tier module's genesis state.
 message GenesisState {
            Params    params        = 1 [(gogoproto.nullable) = false];
-  repeated Portfolio portfolioList = 2 [(gogoproto.nullable) = false];
+  repeated Portfolio portfolio_list = 2 [(gogoproto.nullable) = false];
 }
 
diff --git a/proto/elys/tier/query.proto b/proto/elys/tier/query.proto
@@ -177,9 +177,9 @@ message QueryGetConsolidatedPriceRequest {
 }
 
 message QueryGetConsolidatedPriceResponse {
-  string ammPrice = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  string oraclePrice = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  string oraclePriceDec = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string amm_price = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string oracle_price = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string oracle_price_dec = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
 message QueryStakedRequest {
@@ -190,6 +190,6 @@ message QueryStakedResponse {
   string commitments = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
   string delegations = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
   string unbondings = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  string totalVested = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string total_vested = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
diff --git a/proto/elys/tradeshield/genesis.proto b/proto/elys/tradeshield/genesis.proto
@@ -11,9 +11,9 @@ option go_package = "github.com/elys-network/elys/x/tradeshield/types";
 // GenesisState defines the tradeshield module's genesis state.
 message GenesisState {
            Params                params                     = 1 [(gogoproto.nullable) = false];
-  repeated SpotOrder             pendingSpotOrderList       = 2 [(gogoproto.nullable) = false];
-           uint64                pendingSpotOrderCount      = 3;
-  repeated PerpetualOrder pendingPerpetualOrderList  = 4 [(gogoproto.nullable) = false];
-           uint64                pendingPerpetualOrderCount = 5;
+  repeated SpotOrder             pending_spot_order_list       = 2 [(gogoproto.nullable) = false];
+           uint64                pending_spot_order_count      = 3;
+  repeated PerpetualOrder pending_perpetual_order_list  = 4 [(gogoproto.nullable) = false];
+           uint64                pending_perpetual_order_count = 5;
 }
 
diff --git a/proto/elys/tradeshield/query.proto b/proto/elys/tradeshield/query.proto
@@ -54,15 +54,15 @@ message QueryGetPendingSpotOrderRequest {
 }
 
 message QueryGetPendingSpotOrderResponse {
-  SpotOrder PendingSpotOrder = 1 [(gogoproto.nullable) = false];
+  SpotOrder pending_spot_order = 1 [(gogoproto.nullable) = false];
 }
 
 message QueryAllPendingSpotOrderRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
 message QueryAllPendingSpotOrderResponse {
-  repeated SpotOrder                              PendingSpotOrder = 1 [(gogoproto.nullable) = false];
+  repeated SpotOrder                              pending_spot_order = 1 [(gogoproto.nullable) = false];
            cosmos.base.query.v1beta1.PageResponse pagination       = 2;
 }
 
@@ -71,15 +71,15 @@ message QueryGetPendingPerpetualOrderRequest {
 }
 
 message QueryGetPendingPerpetualOrderResponse {
-  PerpetualOrder PendingPerpetualOrder = 1 [(gogoproto.nullable) = false];
+  PerpetualOrder pending_perpetual_order = 1 [(gogoproto.nullable) = false];
 }
 
 message QueryAllPendingPerpetualOrderRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
 message QueryAllPendingPerpetualOrderResponse {
-  repeated PerpetualOrder                  PendingPerpetualOrder = 1 [(gogoproto.nullable) = false];
+  repeated PerpetualOrder                  pending_perpetual_order = 1 [(gogoproto.nullable) = false];
            cosmos.base.query.v1beta1.PageResponse pagination            = 2;
 }
 
diff --git a/x/amm/client/wasm/query_earn_mining_pool_all.go b/x/amm/client/wasm/query_earn_mining_pool_all.go
@@ -12,16 +12,16 @@ import (
 // Check pool type
 func (oq *Querier) checkFilterType(ctx sdk.Context, ammPool *types.Pool, filterType types.FilterType) bool {
 	switch filterType {
-	case types.FilterType_FilterAll:
+	case types.FilterType_FILTER_ALL:
 		return true
-	case types.FilterType_FilterPerpetual:
+	case types.FilterType_FILTER_PERPETUAL:
 		_, found := oq.perpetualKeeper.GetPool(ctx, ammPool.PoolId)
 		return found
-	case types.FilterType_FilterFixedWeight:
+	case types.FilterType_FILTER_FIXED_WEIGHT:
 		return ammPool.PoolParams.UseOracle
-	case types.FilterType_FilterDynamicWeight:
+	case types.FilterType_FILTER_DYNAMIC_WEIGHT:
 		return !ammPool.PoolParams.UseOracle
-	case types.FilterType_FilterLeverage:
+	case types.FilterType_FILTER_LEVERAGE:
 		_, found := oq.leveragelpKeeper.GetPool(ctx, ammPool.PoolId)
 		return found
 	}
@@ -68,7 +68,7 @@ func (oq *Querier) generateEarnPool(ctx sdk.Context, ammPool *types.Pool, filter
 		rewardsApr = poolInfo.DexApr.Add(poolInfo.EdenApr)
 	}
 
-	if filterType == types.FilterType_FilterLeverage {
+	if filterType == types.FilterType_FILTER_LEVERAGE {
 		prams := oq.stablestakeKeeper.GetParams(ctx)
 		borrowApr = prams.InterestRate
 	}