[Feature] oracle MsgDelegateFeedConsent.Deleagtee to Delegate (#288)

* oracle MsgDelegateFeedConsent.Deleagtee to Delegate * increase oracle reward_band
terra-money · Nov 24, 2019 · 74e8cda · 74e8cda
1 parent 4352374
commit 74e8cda
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 35 deletions.
diff --git a/x/oracle/client/cli/query.go b/x/oracle/client/cli/query.go
@@ -257,9 +257,9 @@ $ terracli query oracle feeder terravaloper...
 				return err
 			}
 
-			var delegatee sdk.AccAddress
-			cdc.MustUnmarshalJSON(res, &delegatee)
-			return cliCtx.PrintOutput(delegatee)
+			var delegate sdk.AccAddress
+			cdc.MustUnmarshalJSON(res, &delegate)
+			return cliCtx.PrintOutput(delegate)
 		},
 	}
 

diff --git a/x/oracle/genesis.go b/x/oracle/genesis.go
@@ -7,12 +7,12 @@ import (
 // InitGenesis initialize default parameters
 // and the keeper's address to pubkey map
 func InitGenesis(ctx sdk.Context, keeper Keeper, data GenesisState) {
-	for delegatorBechAddr, delegatee := range data.FeederDelegations {
+	for delegatorBechAddr, delegate := range data.FeederDelegations {
 		delegator, err := sdk.ValAddressFromBech32(delegatorBechAddr)
 		if err != nil {
 			panic(err)
 		}
-		keeper.SetOracleDelegate(ctx, delegator, delegatee)
+		keeper.SetOracleDelegate(ctx, delegator, delegate)
 	}
 
 	for _, prevote := range data.ExchangeRatePrevotes {
@@ -27,12 +27,12 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data GenesisState) {
 		keeper.SetLunaExchangeRate(ctx, denom, rate)
 	}
 
-	for delegatorBechAddr, delegatee := range data.FeederDelegations {
+	for delegatorBechAddr, delegate := range data.FeederDelegations {
 		delegator, err := sdk.ValAddressFromBech32(delegatorBechAddr)
 		if err != nil {
 			panic(err)
 		}
-		keeper.SetOracleDelegate(ctx, delegator, delegatee)
+		keeper.SetOracleDelegate(ctx, delegator, delegate)
 	}
 
 	for _, prevote := range data.ExchangeRatePrevotes {
@@ -64,9 +64,9 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data GenesisState) {
 func ExportGenesis(ctx sdk.Context, keeper Keeper) (data GenesisState) {
 	params := keeper.GetParams(ctx)
 	feederDelegations := make(map[string]sdk.AccAddress)
-	keeper.IterateOracleDelegates(ctx, func(delegator sdk.ValAddress, delegatee sdk.AccAddress) (stop bool) {
+	keeper.IterateOracleDelegates(ctx, func(delegator sdk.ValAddress, delegate sdk.AccAddress) (stop bool) {
 		bechAddr := delegator.String()
-		feederDelegations[bechAddr] = delegatee
+		feederDelegations[bechAddr] = delegate
 		return false
 	})
 

diff --git a/x/oracle/handler.go b/x/oracle/handler.go
@@ -135,13 +135,13 @@ func handleMsgDelegateFeedConsent(ctx sdk.Context, keeper Keeper, dfpm MsgDelega
 	}
 
 	// Set the delegation
-	keeper.SetOracleDelegate(ctx, signer, dfpm.Delegatee)
+	keeper.SetOracleDelegate(ctx, signer, dfpm.Delegate)
 
 	ctx.EventManager().EmitEvents(sdk.Events{
 		sdk.NewEvent(
 			types.EventTypeFeedDeleate,
 			sdk.NewAttribute(types.AttributeKeyOperator, dfpm.Operator.String()),
-			sdk.NewAttribute(types.AttributeKeyFeeder, dfpm.Delegatee.String()),
+			sdk.NewAttribute(types.AttributeKeyFeeder, dfpm.Delegate.String()),
 		),
 		sdk.NewEvent(
 			sdk.EventTypeMessage,

diff --git a/x/oracle/internal/keeper/keeper.go b/x/oracle/internal/keeper/keeper.go
@@ -238,18 +238,18 @@ func (k Keeper) SetOracleDelegate(ctx sdk.Context, operator sdk.ValAddress, dele
 
 // IterateOracleDelegates iterates over the feed delegates and performs a callback function.
 func (k Keeper) IterateOracleDelegates(ctx sdk.Context,
-	handler func(delegator sdk.ValAddress, delegatee sdk.AccAddress) (stop bool)) {
+	handler func(delegator sdk.ValAddress, delegate sdk.AccAddress) (stop bool)) {
 
 	store := ctx.KVStore(k.storeKey)
 	iter := sdk.KVStorePrefixIterator(store, types.FeederDelegationKey)
 	defer iter.Close()
 	for ; iter.Valid(); iter.Next() {
 		delegator := sdk.ValAddress(iter.Key()[len(types.FeederDelegationKey):])
 
-		var delegatee sdk.AccAddress
-		k.cdc.MustUnmarshalBinaryLengthPrefixed(iter.Value(), &delegatee)
+		var delegate sdk.AccAddress
+		k.cdc.MustUnmarshalBinaryLengthPrefixed(iter.Value(), &delegate)
 
-		if handler(delegator, delegatee) {
+		if handler(delegator, delegate) {
 			break
 		}
 	}

diff --git a/x/oracle/internal/keeper/keeper_test.go b/x/oracle/internal/keeper/keeper_test.go
@@ -294,17 +294,17 @@ func TestIterateFeederDelegations(t *testing.T) {
 	input.OracleKeeper.SetOracleDelegate(input.Ctx, ValAddrs[0], Addrs[1])
 
 	var delegators []sdk.ValAddress
-	var delegatees []sdk.AccAddress
-	input.OracleKeeper.IterateOracleDelegates(input.Ctx, func(delegator sdk.ValAddress, delegatee sdk.AccAddress) (stop bool) {
+	var delegates []sdk.AccAddress
+	input.OracleKeeper.IterateOracleDelegates(input.Ctx, func(delegator sdk.ValAddress, delegate sdk.AccAddress) (stop bool) {
 		delegators = append(delegators, delegator)
-		delegatees = append(delegatees, delegatee)
+		delegates = append(delegates, delegate)
 		return false
 	})
 
 	require.Equal(t, 1, len(delegators))
-	require.Equal(t, 1, len(delegatees))
+	require.Equal(t, 1, len(delegates))
 	require.Equal(t, ValAddrs[0], delegators[0])
-	require.Equal(t, Addrs[1], delegatees[0])
+	require.Equal(t, Addrs[1], delegates[0])
 }
 
 func TestMissCounter(t *testing.T) {

diff --git a/x/oracle/internal/keeper/querier.go b/x/oracle/internal/keeper/querier.go
@@ -184,8 +184,8 @@ func queryFeederDelegation(ctx sdk.Context, req abci.RequestQuery, keeper Keeper
 		return nil, sdk.ErrUnknownRequest(sdk.AppendMsgToErr("incorrectly formatted request data", err.Error()))
 	}
 
-	delegatee := keeper.GetOracleDelegate(ctx, params.Validator)
-	bz, err := codec.MarshalJSONIndent(keeper.cdc, delegatee)
+	delegate := keeper.GetOracleDelegate(ctx, params.Validator)
+	bz, err := codec.MarshalJSONIndent(keeper.cdc, delegate)
 	if err != nil {
 		return nil, sdk.ErrInternal(sdk.AppendMsgToErr("could not marshal result to JSON", err.Error()))
 	}

diff --git a/x/oracle/internal/keeper/querier_test.go b/x/oracle/internal/keeper/querier_test.go
@@ -269,7 +269,7 @@ func TestQueryFeederDelegation(t *testing.T) {
 	res, err := querier(input.Ctx, []string{types.QueryFeederDelegation}, req)
 	require.NoError(t, err)
 
-	var delegatee sdk.AccAddress
-	cdc.UnmarshalJSON(res, &delegatee)
-	require.Equal(t, Addrs[1], delegatee)
+	var delegate sdk.AccAddress
+	cdc.UnmarshalJSON(res, &delegate)
+	require.Equal(t, Addrs[1], delegate)
 }
diff --git a/x/oracle/internal/types/msgs.go b/x/oracle/internal/types/msgs.go
@@ -159,15 +159,15 @@ func (msg MsgExchangeRateVote) String() string {
 
 // MsgDelegateFeedConsent - struct for delegating oracle voting rights to another address.
 type MsgDelegateFeedConsent struct {
-	Operator  sdk.ValAddress `json:"operator" yaml:"operator"`
-	Delegatee sdk.AccAddress `json:"delegatee" yaml:"delegatee"`
+	Operator sdk.ValAddress `json:"operator" yaml:"operator"`
+	Delegate sdk.AccAddress `json:"delegate" yaml:"delegate"`
 }
 
 // NewMsgDelegateFeedConsent creates a MsgDelegateFeedConsent instance
 func NewMsgDelegateFeedConsent(operatorAddress sdk.ValAddress, feederAddress sdk.AccAddress) MsgDelegateFeedConsent {
 	return MsgDelegateFeedConsent{
-		Operator:  operatorAddress,
-		Delegatee: feederAddress,
+		Operator: operatorAddress,
+		Delegate: feederAddress,
 	}
 }
 
@@ -193,7 +193,7 @@ func (msg MsgDelegateFeedConsent) ValidateBasic() sdk.Error {
 		return sdk.ErrInvalidAddress("Invalid address: " + msg.Operator.String())
 	}
 
-	if msg.Delegatee.Empty() {
+	if msg.Delegate.Empty() {
 		return sdk.ErrInvalidAddress("Invalid address: " + msg.Operator.String())
 	}
 
@@ -204,6 +204,6 @@ func (msg MsgDelegateFeedConsent) ValidateBasic() sdk.Error {
 func (msg MsgDelegateFeedConsent) String() string {
 	return fmt.Sprintf(`MsgDelegateFeedConsent
 	operator:    %s, 
-	delegatee:   %s`,
-		msg.Operator, msg.Delegatee)
+	delegate:   %s`,
+		msg.Operator, msg.Delegate)
 }
diff --git a/x/oracle/internal/types/msgs_test.go b/x/oracle/internal/types/msgs_test.go
@@ -72,7 +72,7 @@ func TestMsgFeederDelegation(t *testing.T) {
 
 	tests := []struct {
 		delegator  sdk.ValAddress
-		delegatee  sdk.AccAddress
+		delegate   sdk.AccAddress
 		expectPass bool
 	}{
 		{sdk.ValAddress(addrs[0]), addrs[1], true},
@@ -82,7 +82,7 @@ func TestMsgFeederDelegation(t *testing.T) {
 	}
 
 	for i, tc := range tests {
-		msg := NewMsgDelegateFeedConsent(tc.delegator, tc.delegatee)
+		msg := NewMsgDelegateFeedConsent(tc.delegator, tc.delegate)
 		if tc.expectPass {
 			require.Nil(t, msg.ValidateBasic(), "test: %v", i)
 		} else {

diff --git a/x/oracle/internal/types/params.go b/x/oracle/internal/types/params.go
@@ -34,7 +34,7 @@ const (
 // Default parameter values
 var (
 	DefaultVoteThreshold     = sdk.NewDecWithPrec(50, 2)                                             // 50%
-	DefaultRewardBand        = sdk.NewDecWithPrec(1, 2)                                              // 1%
+	DefaultRewardBand        = sdk.NewDecWithPrec(2, 2)                                              // 1%
 	DefaultWhitelist         = DenomList{core.MicroKRWDenom, core.MicroSDRDenom, core.MicroUSDDenom} // ukrw, usdr, uusd
 	DefaultSlashFraction     = sdk.NewDecWithPrec(1, 4)                                              // 0.01%
 	DefaultMinValidPerWindow = sdk.NewDecWithPrec(5, 2)                                              // 5%