Merge pull request #170 from wukongcheng/silei/refactor

Silei/refactor: router seal && genesis default account balance
irisnet · Aug 24, 2018 · 977f8d6 · 977f8d6
2 parents 71e1356 + 9c1b556
commit 977f8d6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/app/app.go b/app/app.go
@@ -131,7 +131,7 @@ func NewIrisApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		AddRoute("ibc", []*sdk.KVStoreKey{app.keyIBC, app.keyAccount}, ibc.NewHandler(app.ibcMapper, app.coinKeeper)).
 		AddRoute("stake", []*sdk.KVStoreKey{app.keyStake, app.keyAccount}, stake.NewHandler(app.stakeKeeper)).
 		AddRoute("slashing", []*sdk.KVStoreKey{app.keySlashing, app.keyStake}, slashing.NewHandler(app.slashingKeeper)).
-		AddRoute("gov", []*sdk.KVStoreKey{app.keyGov, app.keyAccount, app.keyStake, app.keyIparams}, gov.NewHandler(app.govKeeper)).
+		AddRoute("gov", []*sdk.KVStoreKey{app.keyGov, app.keyAccount, app.keyStake, app.keyIparams, app.keyParams}, gov.NewHandler(app.govKeeper)).
 		AddRoute("upgrade", []*sdk.KVStoreKey{app.keyUpgrade, app.keyStake}, upgrade.NewHandler(app.upgradeKeeper))
 
 	app.feeManager = bam.NewFeeManager(app.iparamsKeeper.Getter())

diff --git a/app/genesis.go b/app/genesis.go
@@ -170,7 +170,7 @@ func IrisAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (genesisState
 		// create the genesis account, give'm few steaks and a buncha token with there name
 		accAuth := auth.NewBaseAccountWithAddress(genTx.Address)
 		accAuth.Coins = sdk.Coins{
-			{denom, totalTokenAmt},
+			{denom, sdk.NewInt(freeFermionVal)},
 		}
 		acc := NewGenesisAccount(&accAuth)
 		genaccs[i] = acc

diff --git a/baseapp/setters.go b/baseapp/setters.go
@@ -82,9 +82,9 @@ func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
 	app.pubkeyPeerFilter = pf
 }
 func (app *BaseApp) Router() Router {
-	if app.sealed {
-		panic("Router() on sealed BaseApp")
-	}
+	//if app.sealed {
+	//	panic("Router() on sealed BaseApp")
+	//}
 	return app.router
 }
 func (app *BaseApp) Seal()          { app.sealed = true }