cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix(lotus-sim): make NewNode take a repo

Browse Source 
This is primarily for testing, so we can just pass an in-memory repo.
This commit is contained in:
Steven Allen 2021-06-21 11:32:19 -07:00
parent c532b1b819
commit b7c36bc02c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/lotus-sim/simulation/node.go
View File

@ -29,12 +29,17 @@ type Node struct {
} }
// OpenNode opens the local lotus node for writing. This will fail if the node is online. // OpenNode opens the local lotus node for writing. This will fail if the node is online.
func OpenNode(ctx context.Context, path string) (node *Node, _err error) { func OpenNode(ctx context.Context, path string) (*Node, error) {
r, err := repo.NewFS(path) r, err := repo.NewFS(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewNode(ctx, r)
}
// NewNode constructs a new node from the given repo.
func NewNode(ctx context.Context, r repo.Repo) (nd *Node, _err error) {
lr, err := r.Lock(repo.FullNode) lr, err := r.Lock(repo.FullNode)
if err != nil { if err != nil {
return nil, err return nil, err
@ -54,26 +59,15 @@ func OpenNode(ctx context.Context, path string) (node *Node, _err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
node = NewNode(bs, ds)
node.repo = lr
return node, nil
}
// NewNode will construct a new simulation node from a datastore (used to store simulation
// configuration) and a blockstore (chain + state).
func NewNode(bs blockstore.Blockstore, ds datastore.Batching) *Node {
return &Node{ return &Node{
repo: lr,
Chainstore: store.NewChainStore(bs, bs, ds, vm.Syscalls(mock.Verifier), nil), Chainstore: store.NewChainStore(bs, bs, ds, vm.Syscalls(mock.Verifier), nil),
MetadataDS: ds, MetadataDS: ds,
Blockstore: bs, Blockstore: bs,
} }, err
} }
// Close cleanly close the repo. Please call this on shutdown to make sure everything is flushed. // Close cleanly close the repo. Please call this on shutdown to make sure everything is flushed.
//
// This function is a no-op when the node is manually constructed with `NewNode`.
func (nd *Node) Close() error { func (nd *Node) Close() error {
if nd.repo != nil { if nd.repo != nil {
return nd.repo.Close() return nd.repo.Close()