docs for genutil genaccounts

cosmos · rigelrozanski · May 16, 2019 · Apr 3, 2019 · Apr 4, 2019 · Apr 4, 2019
commit 2b94f534a0951bea2a1305c53c67fa3a8cf4261a
diff --git a/x/genaccounts/doc.go b/x/genaccounts/doc.go
@@ -0,0 +1,9 @@
+/*
+Package genaccounts contains specialized functionality for initializing
+accounts from genesis including:
+ - genesis account validation,
+ - initchain processing of genesis accounts,
+ - export processing (to genesis) of accounts,
+ - server command for adding accounts to the genesis file.
+*/
+package genaccounts
diff --git a/x/genaccounts/genesis_account_test.go b/x/genaccounts/genesis_account_test.go
@@ -48,7 +48,6 @@ func TestGenesisAccountValidate(t *testing.T) {
 	}
 }
 
-// XXX cleanup
 func TestToAccount(t *testing.T) {
 	priv := ed25519.GenPrivKey()
 	addr := sdk.AccAddress(priv.PubKey().Address())

diff --git a/x/genaccounts/module.go b/x/genaccounts/module.go
@@ -76,7 +76,8 @@ func (am AppModule) NewQuerierHandler() sdk.Querier { return nil }
 func (am AppModule) InitGenesis(ctx sdk.Context, data json.RawMessage) []abci.ValidatorUpdate {
 	var genesisState GenesisState
 	moduleCdc.MustUnmarshalJSON(data, &genesisState)
-	return InitGenesis(ctx, moduleCdc, am.accountKeeper, genesisState)
+	InitGenesis(ctx, moduleCdc, am.accountKeeper, genesisState)
+	return []abci.ValidatorUpdate{}
 }
 
 // module export genesis

diff --git a/x/genutil/doc.go b/x/genutil/doc.go
@@ -0,0 +1,10 @@
+/*
+Package genutil contains a variety of genesis utility functionality
+for usage within a blockchain application. Namely:
+ - Genesis transactions related (gentx)
+    - commands for collection and creation of gentxs
+	- initchain processing of gentxs
+ - Genesis file validation
+ - Tendermint related initialization
+*/
+package genutil
diff --git a/x/genutil/export.go b/x/genutil/export.go
diff --git a/x/genutil/genesis_account.go b/x/genutil/genesis_account.go
diff --git a/x/genutil/genesis_account_test.go b/x/genutil/genesis_account_test.go
diff --git a/x/genutil/init.go b/x/genutil/init.go
@@ -12,15 +12,6 @@ func InitGenesis(ctx sdk.Context, cdc *codec.Codec,
 	accountKeeper AccountKeeper, stakingKeeper StakingKeeper,
 	deliverTx deliverTxfn, genesisState GenesisState) []abci.ValidatorUpdate {
 
-	genesisState.Sanitize()
-
-	// load the accounts
-	for _, gacc := range genesisState.Accounts {
-		acc := gacc.ToAccount()
-		acc = accountKeeper.NewAccount(ctx, acc) // set account number
-		accountKeeper.SetAccount(ctx, acc)
-	}
-
 	var validators []abci.ValidatorUpdate
 	if len(genesisState.GenTxs) > 0 {
 		validators = DeliverGenTxs(ctx, cdc, genesisState.GenTxs, stakingKeeper, deliverTx)

diff --git a/x/genutil/module.go b/x/genutil/module.go
@@ -84,8 +84,7 @@ func (am AppModule) InitGenesis(ctx sdk.Context, data json.RawMessage) []abci.Va
 
 // module export genesis
 func (am AppModule) ExportGenesis(ctx sdk.Context) json.RawMessage {
-	gs := ExportGenesis(ctx, am.accountKeeper)
-	return moduleCdc.MustMarshalJSON(gs)
+	return nil
 }
 
 // module begin-block

diff --git a/x/genutil/server/cli/genesis_accts.go b/x/genutil/server/cli/genesis_accts.go