Merge pull request: refactor func HigherThanMercury(height int64) a bit (#98)

Author: zhongqiuwood

types/milestone.go

@@ -5,6 +5,11 @@ import (
 	"sync"
 )
 
+// Disable followings after milestoneMercuryHeight
+// 1. TransferToContractBlock
+// 2. ChangeEvmDenomByProposal
+// 3. BankTransferBlock
+
 var (
 	MILESTONE_MERCURY_HEIGHT     string
 	milestoneMercuryHeight       int64
@@ -33,26 +38,25 @@ func init() {
 }
 
 //disable transfer tokens to contract address by cli
-func higherThanMercury(height int64) bool {
+func HigherThanMercury(height int64) bool {
 	if milestoneMercuryHeight == 0 {
 		// milestoneMercuryHeight not enabled
 		return false
 	}
 	return height > milestoneMercuryHeight
 }
 
-
-//disable transfer tokens to contract address by cli
-func IsDisableTransferToContractBlock(height int64) bool {
-	return higherThanMercury(height)
-}
-
-//disable change the param EvmDenom by proposal
-func IsDisableChangeEvmDenomByProposal(height int64) bool {
-	return higherThanMercury(height)
-}
-
-//disable transfer tokens by module of cosmos-sdk/bank
-func IsDisableBankTransferBlock(height int64) bool {
-	return higherThanMercury(height)
-}
+////disable transfer tokens to contract address by cli
+//func IsDisableTransferToContractBlock(height int64) bool {
+//	return higherThanMercury(height)
+//}
+//
+////disable change the param EvmDenom by proposal
+//func IsDisableChangeEvmDenomByProposal(height int64) bool {
+//	return higherThanMercury(height)
+//}
+//
+////disable transfer tokens by module of cosmos-sdk/bank
+//func IsDisableBankTransferBlock(height int64) bool {
+//	return higherThanMercury(height)
+//}

x/bank/handler.go

@@ -11,7 +11,7 @@ import (
 func NewHandler(k keeper.Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 
-		if sdk.IsDisableBankTransferBlock(ctx.BlockHeight()) {
+		if sdk.HigherThanMercury(ctx.BlockHeight()) {
 			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "bank message is disabled")
 		}