Upgrade4: gRevert "update1 (lino-network#410)" (lino-network#413)

* gRevert "update1 (lino-network#410)" This reverts commit 91b3006. * fix export typo
markall93 · Oct 14, 2019 · e1de43e · e1de43e
1 parent bb9a0aa
commit e1de43e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/types/const.go b/types/const.go
@@ -174,9 +174,6 @@ const (
 	// ValidatorMaxPower - the max power of validator can have
 	ValidatorMaxPower = int64(100000000000)
 
-	// Upgrade3Update1 - lower register fee.
-	Upgrade3Update1 = 27000
-
 	// TxSigLimit - max number of sigs in one transaction
 	// XXX(yumin): This will actually limit the number of msg per tx to at most 2.
 	TxSigLimit = 2

diff --git a/x/account/manager/manager.go b/x/account/manager/manager.go
@@ -52,9 +52,6 @@ func (accManager AccountManager) RegisterAccount(
 		return err
 	}
 	minRegFee := accParams.RegisterFee
-	if ctx.BlockHeight() >= linotypes.Upgrade3Update1 {
-		minRegFee = linotypes.NewCoinFromInt64(10000)
-	}
 	if minRegFee.IsGT(registerFee) {
 		return types.ErrRegisterFeeInsufficient()
 	}

diff --git a/x/validator/manager/manager.go b/x/validator/manager/manager.go
@@ -1121,7 +1121,7 @@ func (vm ValidatorManager) ExportToFile(ctx sdk.Context, cdc *codec.Codec, filep
 	})
 
 	// export votes
-	substores[string(model.ValidatorListSubstore)].Iterate(func(key []byte, val interface{}) bool {
+	substores[string(model.ElectionVoteListSubstore)].Iterate(func(key []byte, val interface{}) bool {
 		user := linotypes.AccountKey(key)
 		votelist := val.(*model.ElectionVoteList)
 		votesIR := make([]model.ElectionVoteIR, 0)