node, postage: persist and load batches (#1632)

pkg/node/node.go

@@ -91,6 +91,7 @@ type Bee struct {
 	transactionMonitorCloser io.Closer
 	recoveryHandleCleanup    func()
 	listenerCloser           io.Closer
+	postageServiceCloser     io.Closer
 }
 
 type Options struct {
@@ -311,7 +312,11 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
 		return nil, fmt.Errorf("batchstore: %w", err)
 	}
 	validStamp := postage.ValidStamp(batchStore)
-	post := postage.NewService(stateStore, chainID)
+	post, err := postage.NewService(stateStore, chainID)
+	if err != nil {
+		return nil, fmt.Errorf("postage service load: %w", err)
+	}
+	b.postageServiceCloser = post
 
 	var (
 		postageContractService postagecontract.Interface
@@ -714,10 +719,14 @@ func (b *Bee) Shutdown(ctx context.Context) error {
 
 	if b.listenerCloser != nil {
 		if err := b.listenerCloser.Close(); err != nil {
-			errs.add(fmt.Errorf("error listener: %w", err))
+			errs.add(fmt.Errorf("listener: %w", err))
 		}
 	}
 
+	if err := b.postageServiceCloser.Close(); err != nil {
+		errs.add(fmt.Errorf("postage service: %w", err))
+	}
+
 	if err := b.stateStoreCloser.Close(); err != nil {
 		errs.add(fmt.Errorf("statestore: %w", err))
 	}

pkg/postage/mock/service.go

@@ -64,10 +64,6 @@ func (m *mockPostage) GetStampIssuer(id []byte) (*postage.StampIssuer, error) {
 	return nil, errors.New("stampissuer not found")
 }
 
-func (m *mockPostage) Load() error {
-	panic("not implemented") // TODO: Implement
-}
-
-func (m *mockPostage) Save() error {
-	panic("not implemented") // TODO: Implement
+func (m *mockPostage) Close() error {
+	return nil
 }

pkg/postage/service.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"io"
 	"sync"
 
 	"github.com/ethersphere/bee/pkg/storage"
@@ -27,8 +28,7 @@ type Service interface {
 	Add(*StampIssuer)
 	StampIssuers() []*StampIssuer
 	GetStampIssuer([]byte) (*StampIssuer, error)
-	Load() error
-	Save() error
+	io.Closer
 }
 
 // service handles postage batches
@@ -41,11 +41,28 @@ type service struct {
 }
 
 // NewService constructs a new Service.
-func NewService(store storage.StateStorer, chainID int64) Service {
-	return &service{
+func NewService(store storage.StateStorer, chainID int64) (Service, error) {
+	s := &service{
 		store:   store,
 		chainID: chainID,
 	}
+
+	n := 0
+	if err := s.store.Iterate(s.key(), func(_, _ []byte) (stop bool, err error) {
+		n++
+		return false, nil
+	}); err != nil {
+		return nil, err
+	}
+	for i := 0; i < n; i++ {
+		st := &StampIssuer{}
+		err := s.store.Get(s.keyForIndex(i), st)
+		if err != nil {
+			return nil, err
+		}
+		s.Add(st)
+	}
+	return s, nil
 }
 
 // Add adds a stamp issuer to the active issuers.
@@ -74,28 +91,8 @@ func (ps *service) GetStampIssuer(batchID []byte) (*StampIssuer, error) {
 	return nil, ErrNotFound
 }
 
-// Load loads all active batches (stamp issuers) from the statestore.
-func (ps *service) Load() error {
-	n := 0
-	if err := ps.store.Iterate(ps.key(), func(key, _ []byte) (stop bool, err error) {
-		n++
-		return false, nil
-	}); err != nil {
-		return err
-	}
-	for i := 0; i < n; i++ {
-		st := &StampIssuer{}
-		err := ps.store.Get(ps.keyForIndex(i), st)
-		if err != nil {
-			return err
-		}
-		ps.Add(st)
-	}
-	return nil
-}
-
-// Save saves all the active stamp issuers to statestore.
-func (ps *service) Save() error {
+// Close saves all the active stamp issuers to statestore.
+func (ps *service) Close() error {
 	for i, st := range ps.issuers {
 		if err := ps.store.Put(ps.keyForIndex(i), st); err != nil {
 			return err

pkg/postage/service_test.go

@@ -19,18 +19,21 @@ import (
 func TestSaveLoad(t *testing.T) {
 	store := storemock.NewStateStore()
 	saved := func(id int64) postage.Service {
-		ps := postage.NewService(store, id)
+		ps, err := postage.NewService(store, id)
+		if err != nil {
+			t.Fatal(err)
+		}
 		for i := 0; i < 16; i++ {
 			ps.Add(newTestStampIssuer(t))
 		}
-		if err := ps.Save(); err != nil {
+		if err := ps.Close(); err != nil {
 			t.Fatal(err)
 		}
 		return ps
 	}
 	loaded := func(id int64) postage.Service {
-		ps := postage.NewService(store, id)
-		if err := ps.Load(); err != nil {
+		ps, err := postage.NewService(store, id)
+		if err != nil {
 			t.Fatal(err)
 		}
 		return ps
@@ -48,7 +51,10 @@ func TestSaveLoad(t *testing.T) {
 
 func TestGetStampIssuer(t *testing.T) {
 	store := storemock.NewStateStore()
-	ps := postage.NewService(store, int64(0))
+	ps, err := postage.NewService(store, int64(0))
+	if err != nil {
+		t.Fatal(err)
+	}
 	ids := make([][]byte, 8)
 	for i := range ids {
 		id := make([]byte, 32)