Merge pull request #139 from PeggyJV/bolten/4.0.0-rc2

Remove cellarfees module account balance check

x/cellarfees/keeper/genesis.go

@@ -17,14 +17,7 @@ func InitGenesis(ctx sdk.Context, k Keeper, gs types.GenesisState) {
 		panic(fmt.Sprintf("%s module account has not been set", types.ModuleName))
 	}
 
-	// TODO(bolten): I added this check since other cosmos-sdk modules were doing this,
-	// but it seems to me that SetModuleAccount is getting called when GetModuleAccount
-	// has to create a new module account anyway, which will happen by proxy when we call
-	// GetFeesAccount, so not sure how necessary this is
-	balances := k.bankKeeper.GetAllBalances(ctx, feesAccount.GetAddress())
-	if balances.IsZero() {
-		k.accountKeeper.SetModuleAccount(ctx, feesAccount)
-	}
+	k.accountKeeper.SetModuleAccount(ctx, feesAccount)
 }
 
 // ExportGenesis returns the module's exported genesis.