rename DefaultGenesis to TestGenesis

- moved to testing as its only used in testing

actor/builtin/miner_redeem_test.go

@@ -190,7 +190,7 @@ func requireGenesis(ctx context.Context, t *testing.T, targetAddresses ...addres
 	vms := vm.NewStorageMap(bs)
 
 	cst := hamt.NewCborStore()
-	blk, err := consensus.DefaultGenesis(cst, bs)
+	blk, err := consensus.TestGenesis(cst, bs)
 	require.NoError(err)
 
 	st, err := state.LoadStateTree(ctx, cst, blk.StateRoot, builtin.Actors)

actor/builtin/paymentbroker/paymentbroker_test.go

@@ -1124,7 +1124,7 @@ func requireGenesis(ctx context.Context, t *testing.T, targetAddresses ...addres
 	vms := vm.NewStorageMap(bs)
 
 	cst := hamt.NewCborStore()
-	blk, err := consensus.DefaultGenesis(cst, bs)
+	blk, err := consensus.TestGenesis(cst, bs)
 	require.NoError(t, err)
 
 	builtinsWithTestActor := map[cid.Cid]exec.ExecutableActor{}

consensus/expected_test.go

@@ -84,7 +84,7 @@ func TestExpected_RunStateTransition_validateMining(t *testing.T) {
 	ctx := context.Background()
 
 	cistore, bstore, verifier := setupCborBlockstoreProofs()
-	genesisBlock, err := consensus.DefaultGenesis(cistore, bstore)
+	genesisBlock, err := consensus.TestGenesis(cistore, bstore)
 	require.NoError(t, err)
 
 	t.Run("passes the validateMining section when given valid mining blocks", func(t *testing.T) {

consensus/genesis.go

@@ -192,11 +192,6 @@ func MakeGenesisFunc(opts ...GenOption) GenesisInitFunc {
 	}
 }
 
-// DefaultGenesis creates a genesis block with default accounts and actors installed.
-func DefaultGenesis(cst *hamt.CborIpldStore, bs blockstore.Blockstore) (*types.Block, error) {
-	return MakeGenesisFunc()(cst, bs)
-}
-
 // SetupDefaultActors inits the builtin actors that are required to run filecoin.
 func SetupDefaultActors(ctx context.Context, st state.Tree, storageMap vm.StorageMap, storeType types.ProofsMode) error {
 	for addr, val := range defaultAccounts {

consensus/testing.go

@@ -2,15 +2,22 @@ package consensus
 
 import (
 	"context"
+
+	"github.com/ipfs/go-hamt-ipld"
+	"github.com/ipfs/go-ipfs-blockstore"
+	"github.com/stretchr/testify/require"
+
 	"github.com/filecoin-project/go-filecoin/actor"
 	"github.com/filecoin-project/go-filecoin/address"
 	"github.com/filecoin-project/go-filecoin/state"
 	"github.com/filecoin-project/go-filecoin/types"
-	"github.com/ipfs/go-ipfs-blockstore"
-
-	"github.com/stretchr/testify/require"
 )
 
+// TestGenesis creates a genesis block with default accounts and actors installed for testing.
+func TestGenesis(cst *hamt.CborIpldStore, bs blockstore.Blockstore) (*types.Block, error) {
+	return MakeGenesisFunc()(cst, bs)
+}
+
 // TestView is an implementation of stateView used for testing the chain
 // manager.  It provides a consistent view that the storage market
 // that returns 1 for storage total and 1 for any miner storage.

core/testing.go

@@ -137,7 +137,7 @@ func CreateStorages(ctx context.Context, t *testing.T) (state.Tree, vm.StorageMa
 	cst := hamt.NewCborStore()
 	d := datastore.NewMapDatastore()
 	bs := blockstore.NewBlockstore(d)
-	blk, err := consensus.DefaultGenesis(cst, bs)
+	blk, err := consensus.TestGenesis(cst, bs)
 	require.NoError(t, err)
 
 	st, err := state.LoadStateTree(ctx, cst, blk.StateRoot, builtin.Actors)

node/node_test.go

@@ -60,7 +60,7 @@ func TestConnectsToBootstrapNodes(t *testing.T) {
 		r := repo.NewInMemoryRepo()
 		r.Config().Swarm.Address = "/ip4/0.0.0.0/tcp/0"
 
-		require.NoError(t, node.Init(ctx, r, consensus.DefaultGenesis))
+		require.NoError(t, node.Init(ctx, r, consensus.TestGenesis))
 		r.Config().Bootstrap.Addresses = []string{}
 		opts, err := node.OptionsFromRepo(r)
 		require.NoError(t, err)
@@ -87,7 +87,7 @@ func TestConnectsToBootstrapNodes(t *testing.T) {
 		r := repo.NewInMemoryRepo()
 		r.Config().Swarm.Address = "/ip4/0.0.0.0/tcp/0"
 
-		require.NoError(t, node.Init(ctx, r, consensus.DefaultGenesis))
+		require.NoError(t, node.Init(ctx, r, consensus.TestGenesis))
 		r.Config().Bootstrap.Addresses = []string{peer1, peer2}
 
 		opts, err := node.OptionsFromRepo(r)
@@ -169,7 +169,7 @@ func TestOptionWithError(t *testing.T) {
 
 	ctx := context.Background()
 	r := repo.NewInMemoryRepo()
-	assert.NoError(t, node.Init(ctx, r, consensus.DefaultGenesis))
+	assert.NoError(t, node.Init(ctx, r, consensus.TestGenesis))
 
 	opts, err := node.OptionsFromRepo(r)
 	assert.NoError(t, err)
@@ -208,7 +208,7 @@ func TestNodeConfig(t *testing.T) {
 		ConfigOpts:  configOptions,
 		InitOpts:    initOpts,
 		OfflineMode: true,
-		GenesisFunc: consensus.DefaultGenesis,
+		GenesisFunc: consensus.TestGenesis,
 	}
 
 	n := node.GenNode(t, &tno)

node/testing.go

@@ -177,15 +177,15 @@ func MakeNodesUnstartedWithGif(t *testing.T, numNodes int, offlineMode bool, gif
 // MakeNodesUnstarted creates some new nodes with an InMemoryRepo, fake proof verifier, and default genesis block.
 // Call StartNodes to start them.
 func MakeNodesUnstarted(t *testing.T, numNodes int, offlineMode bool) []*Node {
-	return MakeNodesUnstartedWithGif(t, numNodes, offlineMode, consensus.DefaultGenesis)
+	return MakeNodesUnstartedWithGif(t, numNodes, offlineMode, consensus.TestGenesis)
 }
 
 // MakeOfflineNode returns a single unstarted offline node.
 func MakeOfflineNode(t *testing.T) *Node {
 	return MakeNodesUnstartedWithGif(t,
 		1,    /* 1 node */
 		true, /* offline */
-		consensus.DefaultGenesis)[0]
+		consensus.TestGenesis)[0]
 }
 
 // DefaultTestingConfig returns default configuration for testing

plumbing/msg/waiter_test.go

@@ -45,7 +45,7 @@ type smsgs []*types.SignedMessage
 type smsgsSet [][]*types.SignedMessage
 
 func setupTest(t *testing.T) (*hamt.CborIpldStore, *chain.Store, *Waiter) {
-	d := requiredCommonDeps(t, consensus.DefaultGenesis)
+	d := requiredCommonDeps(t, consensus.TestGenesis)
 	return d.cst, d.chainStore, NewWaiter(d.chainStore, d.blockstore, d.cst)
 }