Skip to content

Commit

Permalink
fix the lint error about proto-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
TimmyExogenous committed Mar 8, 2024
1 parent c413c7b commit 493a0c4
Show file tree
Hide file tree
Showing 9 changed files with 204 additions and 203 deletions.
1 change: 0 additions & 1 deletion proto/exocore/delegation/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package exocore.delegation.v1;

import "cosmos/query/v1/query.proto";
import "cosmos_proto/cosmos.proto";
import "exocore/delegation/v1/tx.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

Expand Down
1 change: 0 additions & 1 deletion proto/exocore/operator/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package exocore.operator.v1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "cosmos/query/v1/query.proto";
import "cosmos_proto/cosmos.proto";
import "exocore/operator/v1/tx.proto";
import "tendermint/crypto/keys.proto";
Expand Down
4 changes: 2 additions & 2 deletions proto/exocore/operator/v1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import "amino/amino.proto";

option go_package = "github.com/ExocoreNetwork/exocore/x/operator/types";

// ValueField is a field that holds a value of sdk.LegacyDec type.
message ValueField {
// DecValueField is a field that holds a value of sdk.LegacyDec type.
message DecValueField {
// amount is the USD value of the asset, as an sdk.LegacyDec.
string amount = 1
[
Expand Down
4 changes: 3 additions & 1 deletion proto/exocore/restaking_assets_manage/v1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import "gogoproto/gogo.proto";

option go_package = "github.com/ExocoreNetwork/exocore/x/restaking_assets_manage/types";

// ValueField is a field that holds a value of sdk.Int type.
message ValueField {
string Amount = 1
// amount is the amount of the asset, as an sdk.Int.
string amount = 1
[
(cosmos_proto.scalar) = "cosmos.Int",
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
Expand Down
87 changes: 43 additions & 44 deletions x/delegation/types/query.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions x/operator/keeper/avs_operator_shares.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (k *Keeper) UpdateOperatorShare(ctx sdk.Context, avsAddr, operatorAddr stri
}
key = restakingtype.GetJoinedStoreKey(avsAddr, operatorAddr)

totalValue := operatortypes.ValueField{Amount: sdkmath.LegacyNewDec(0)}
totalValue := operatortypes.DecValueField{Amount: sdkmath.LegacyNewDec(0)}
if store.Has(key) {
value := store.Get(key)
k.cdc.MustUnmarshal(value, &totalValue)
Expand Down Expand Up @@ -51,7 +51,7 @@ func (k *Keeper) DeleteOperatorShare(ctx sdk.Context, avsAddr, operatorAddr stri

func (k *Keeper) GetOperatorShare(ctx sdk.Context, avsAddr, operatorAddr string) (sdkmath.LegacyDec, error) {
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorAssetsTotalValue)
var ret operatortypes.ValueField
var ret operatortypes.DecValueField
var key []byte
if operatorAddr == "" {
return sdkmath.LegacyDec{}, errorsmod.Wrap(operatortypes.ErrParameterInvalid, "GetOperatorShare the operatorAddr is empty")
Expand All @@ -74,7 +74,7 @@ func (k *Keeper) UpdateAVSShare(ctx sdk.Context, avsAddr string, opAmount sdkmat
}
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorAssetsTotalValue)
key := []byte(avsAddr)
totalValue := operatortypes.ValueField{Amount: sdkmath.LegacyNewDec(0)}
totalValue := operatortypes.DecValueField{Amount: sdkmath.LegacyNewDec(0)}
if store.Has(key) {
value := store.Get(key)
k.cdc.MustUnmarshal(value, &totalValue)
Expand All @@ -92,7 +92,7 @@ func (k *Keeper) BatchUpdateShareForAVSAndOperator(ctx sdk.Context, avsOperatorC
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorAssetsTotalValue)
for avs, opAmount := range avsOperatorChange {
key := []byte(avs)
totalValue := operatortypes.ValueField{Amount: sdkmath.LegacyNewDec(0)}
totalValue := operatortypes.DecValueField{Amount: sdkmath.LegacyNewDec(0)}
if store.Has(key) {
value := store.Get(key)
k.cdc.MustUnmarshal(value, &totalValue)
Expand All @@ -110,7 +110,7 @@ func (k *Keeper) BatchUpdateShareForAVSAndOperator(ctx sdk.Context, avsOperatorC

func (k *Keeper) GetAVSShare(ctx sdk.Context, avsAddr string) (sdkmath.LegacyDec, error) {
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorAssetsTotalValue)
var ret operatortypes.ValueField
var ret operatortypes.DecValueField
key := []byte(avsAddr)
isExit := store.Has(key)
if !isExit {
Expand Down Expand Up @@ -214,7 +214,7 @@ func (k *Keeper) UpdateStakerShare(ctx sdk.Context, avsAddr, stakerID, operatorA
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorStakerShareState)
key := restakingtype.GetJoinedStoreKey(avsAddr, stakerID, operatorAddr)

optedInValue := operatortypes.ValueField{Amount: sdkmath.LegacyNewDec(0)}
optedInValue := operatortypes.DecValueField{Amount: sdkmath.LegacyNewDec(0)}
if store.Has(key) {
value := store.Get(key)
k.cdc.MustUnmarshal(value, &optedInValue)
Expand All @@ -231,7 +231,7 @@ func (k *Keeper) UpdateStakerShare(ctx sdk.Context, avsAddr, stakerID, operatorA
func (k *Keeper) BatchSetStakerShare(ctx sdk.Context, newValues map[string]sdkmath.LegacyDec) error {
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorStakerShareState)
for key, value := range newValues {
optedInValue := operatortypes.ValueField{Amount: value}
optedInValue := operatortypes.DecValueField{Amount: value}
if store.Has([]byte(key)) {
value := store.Get([]byte(key))
k.cdc.MustUnmarshal(value, &optedInValue)
Expand All @@ -252,7 +252,7 @@ func (k *Keeper) DeleteStakerShare(ctx sdk.Context, avsAddr, stakerID, operatorA

func (k *Keeper) GetStakerShare(ctx sdk.Context, avsAddr, stakerID, operatorAddr string) (sdkmath.LegacyDec, error) {
store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixAVSOperatorStakerShareState)
var ret operatortypes.ValueField
var ret operatortypes.DecValueField
key := restakingtype.GetJoinedStoreKey(avsAddr, stakerID, operatorAddr)
isExit := store.Has(key)
if !isExit {
Expand Down
Loading

0 comments on commit 493a0c4

Please sign in to comment.