Merge pull request #2 from irisnet/develop

Update

docs/resources/delegator-faq.md

@@ -3,7 +3,7 @@
 ## What is a delegator?
 People that cannot, or do not want to run validator operations, can still participate in the staking process as delegators. Indeed, validators are not chosen based on their own stake 
 but based on their total stake, which is the sum of their own stake and of the stake that is delegated to them. This is an important property, as it makes delegators a safeguard against
- validators that exhibit bad behavior. If a validator misbehaves, its delegators will move their Atoms away from it, thereby reducing its stake. Eventually, if a validator's stake falls 
+ validators that exhibit bad behavior. If a validator misbehaves, its delegators will move their IRIS tokens away from it, thereby reducing its stake. Eventually, if a validator's stake falls 
  under the top 100 addresses with highest stake, it will exit the validator set.
 
 ## States for a Delegator
@@ -91,4 +91,4 @@ Please note that you have to wait 10 minute to run the next command:
 iriscli stake unbond  complete   --address-validator=<address-validator> --address-delegator=<address-delegator> --chain-id=fuxi-3001  --from=name --gas=2000000 --fee=40000000000000000iris 
 ```
 
-You could check that the balance of delegator has increased.
+You could check that the balance of delegator has increased.

modules/distribution/keeper/validator.go

@@ -90,7 +90,7 @@ func (k Keeper) takeValidatorFeePoolRewards(ctx sdk.Context, operatorAddr sdk.Va
 			k.SetFeePool(ctx, fp)
 			k.SetValidatorDistInfo(ctx, vi)
 			k.SetDelegationDistInfo(ctx, di)
-			k.WithdrawToDelegator(ctx, fp, accAddr, withdraw)
+			k.WithdrawToDelegator(ctx, fp, delegation.DelegatorAddr, withdraw)
 		}
 		if len(delegations) == 0 {
 			vi := k.GetValidatorDistInfo(ctx, operatorAddr)

modules/service/params.go

@@ -284,7 +284,7 @@ func validateArbitrationTimeLimit(v time.Duration) sdk.Error {
 			return sdk.NewError(params.DefaultCodespace, params.CodeInvalidArbitrationTimeLimit, fmt.Sprintf("Invalid ArbitrationTimeLimit [%s] should be between [5days, 10days]", v.String()))
 		}
 	} else if v < 20*time.Second {
-		return sdk.NewError(params.DefaultCodespace, params.CodeComplaintRetrospect, fmt.Sprintf("Invalid ComplaintRetrospect [%s] should be between [20seconds, )", v.String()))
+		return sdk.NewError(params.DefaultCodespace, params.CodeInvalidArbitrationTimeLimit, fmt.Sprintf("Invalid ArbitrationTimeLimit [%s] should be between [20seconds, )", v.String()))
 	}
 	return nil
 }