Move statestore to lib

chain/deals/client.go

@@ -2,6 +2,7 @@ package deals
 
 import (
 	"context"
+	"github.com/filecoin-project/lotus/lib/statestore"
 	"github.com/filecoin-project/lotus/node/impl/full"
 
 	"github.com/ipfs/go-cid"
@@ -71,7 +72,7 @@ func NewClient(sm *stmgr.StateManager, chain *store.ChainStore, h host.Host, w *
 		discovery: discovery,
 		mpool:     mpool,
 
-		deals: ClientStateStore{StateStore{ds: namespace.Wrap(ds, datastore.NewKey("/deals/client"))}},
+		deals: ClientStateStore{statestore.New(namespace.Wrap(ds, datastore.NewKey("/deals/client")))},
 		conns: map[cid.Cid]inet.Stream{},
 
 		incoming: make(chan *ClientDeal, 16),

chain/deals/provider.go

@@ -2,6 +2,7 @@ package deals
 
 import (
 	"context"
+	"github.com/filecoin-project/lotus/lib/statestore"
 	"sync"
 
 	cid "github.com/ipfs/go-cid"
@@ -95,7 +96,7 @@ func NewProvider(ds dtypes.MetadataDS, sminer *storage.Miner, dag dtypes.Staging
 
 		actor: minerAddress,
 
-		deals: MinerStateStore{StateStore{ds: namespace.Wrap(ds, datastore.NewKey("/deals/client"))}},
+		deals: MinerStateStore{statestore.New(namespace.Wrap(ds, datastore.NewKey("/deals/client")))},
 		ds:    ds,
 	}
 

chain/deals/state_store.go

@@ -2,77 +2,18 @@ package deals
 
 import (
 	"bytes"
+	"github.com/filecoin-project/lotus/lib/statestore"
 
 	"github.com/filecoin-project/lotus/lib/cborrpc"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-datastore/query"
-	"golang.org/x/xerrors"
 )
 
-type StateStore struct {
-	ds datastore.Datastore
-}
-
-func (st *StateStore) Begin(i cid.Cid, state interface{}) error {
-	k := datastore.NewKey(i.String())
-	has, err := st.ds.Has(k)
-	if err != nil {
-		return err
-	}
-	if has {
-		return xerrors.Errorf("Already tracking state for %s", i)
-	}
-
-	b, err := cborrpc.Dump(state)
-	if err != nil {
-		return err
-	}
-
-	return st.ds.Put(k, b)
-}
-
-func (st *StateStore) End(i cid.Cid) error {
-	k := datastore.NewKey(i.String())
-	has, err := st.ds.Has(k)
-	if err != nil {
-		return err
-	}
-	if !has {
-		return xerrors.Errorf("No state for %s", i)
-	}
-	return st.ds.Delete(k)
-}
-
-func (st *StateStore) mutate(i cid.Cid, mutator func([]byte) ([]byte, error)) error {
-	k := datastore.NewKey(i.String())
-	has, err := st.ds.Has(k)
-	if err != nil {
-		return err
-	}
-	if !has {
-		return xerrors.Errorf("No state for %s", i)
-	}
-
-	cur, err := st.ds.Get(k)
-	if err != nil {
-		return err
-	}
-
-	mutated, err := mutator(cur)
-	if err != nil {
-		return err
-	}
-
-	return st.ds.Put(k, mutated)
-}
-
 type MinerStateStore struct {
-	StateStore
+	*statestore.StateStore
 }
 
 func (st *MinerStateStore) MutateMiner(i cid.Cid, mutator func(*MinerDeal) error) error {
-	return st.mutate(i, minerMutator(mutator))
+	return st.Mutate(i, minerMutator(mutator))
 }
 
 func minerMutator(m func(*MinerDeal) error) func([]byte) ([]byte, error) {
@@ -92,11 +33,11 @@ func minerMutator(m func(*MinerDeal) error) func([]byte) ([]byte, error) {
 }
 
 type ClientStateStore struct {
-	StateStore
+	*statestore.StateStore
 }
 
 func (st *ClientStateStore) MutateClient(i cid.Cid, mutator func(*ClientDeal) error) error {
-	return st.mutate(i, clientMutator(mutator))
+	return st.Mutate(i, clientMutator(mutator))
 }
 
 func clientMutator(m func(*ClientDeal) error) func([]byte) ([]byte, error) {
@@ -118,18 +59,11 @@ func clientMutator(m func(*ClientDeal) error) func([]byte) ([]byte, error) {
 func (st *ClientStateStore) ListClient() ([]ClientDeal, error) {
 	var out []ClientDeal
 
-	res, err := st.ds.Query(query.Query{})
+	l, err := st.List()
 	if err != nil {
 		return nil, err
 	}
-	defer res.Close()
+	for _, res := range l {
-
-	for {
-		res, ok := res.NextSync()
-		if !ok {
-			break
-		}
-
 		var deal ClientDeal
 		err := cborrpc.ReadCborRPC(bytes.NewReader(res.Value), &deal)
 		if err != nil {

lib/statestore/store.go

@@ -0,0 +1,95 @@
+package statestore
+
+import (
+	"github.com/filecoin-project/lotus/lib/cborrpc"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore/query"
+	"golang.org/x/xerrors"
+)
+
+type StateStore struct {
+	ds datastore.Datastore
+}
+
+func New(ds datastore.Datastore) *StateStore {
+	return &StateStore{ds:ds}
+}
+
+func (st *StateStore) Begin(i cid.Cid, state interface{}) error {
+	k := datastore.NewKey(i.String())
+	has, err := st.ds.Has(k)
+	if err != nil {
+		return err
+	}
+	if has {
+		return xerrors.Errorf("Already tracking state for %s", i)
+	}
+
+	b, err := cborrpc.Dump(state)
+	if err != nil {
+		return err
+	}
+
+	return st.ds.Put(k, b)
+}
+
+func (st *StateStore) End(i cid.Cid) error {
+	k := datastore.NewKey(i.String())
+	has, err := st.ds.Has(k)
+	if err != nil {
+		return err
+	}
+	if !has {
+		return xerrors.Errorf("No state for %s", i)
+	}
+	return st.ds.Delete(k)
+}
+
+func (st *StateStore) Mutate(i cid.Cid, mutator func([]byte) ([]byte, error)) error {
+	k := datastore.NewKey(i.String())
+	has, err := st.ds.Has(k)
+	if err != nil {
+		return err
+	}
+	if !has {
+		return xerrors.Errorf("No state for %s", i)
+	}
+
+	cur, err := st.ds.Get(k)
+	if err != nil {
+		return err
+	}
+
+	mutated, err := mutator(cur)
+	if err != nil {
+		return err
+	}
+
+	return st.ds.Put(k, mutated)
+}
+
+func (st *StateStore) List() ([]query.Entry, error) {
+	var out []query.Entry
+
+	res, err := st.ds.Query(query.Query{})
+	if err != nil {
+		return nil, err
+	}
+	defer res.Close()
+
+	for {
+		res, ok := res.NextSync()
+		if !ok {
+			break
+		}
+		if res.Error != nil {
+			return nil, res.Error
+		}
+
+		out = append(out, res.Entry)
+	}
+
+	return out, nil
+}
+

node/impl/storminer.go

@@ -47,7 +47,7 @@ func (sm *StorageMinerAPI) StoreGarbageData(ctx context.Context) error {
 			return
 		}
 
-		if err := sm.Sectors.SealSector(ctx, sectorId); err != nil {
+		if err := sm.Miner.SealSector(ctx, sectorId); err != nil {
 			log.Error(err)
 			return
 		}