block in Publish state when message sending fails due to lack of funds (

#638)

* PublishDeal: do not return an error when lacking funds

* unit test: make sure that we stay in StorageDealPublish state if PublishDeal errors with not enough funds error

storagemarket/impl/provider.go

@@ -404,6 +404,10 @@ func (p *Provider) GetStorageCollateral(ctx context.Context) (storagemarket.Bala
 	return p.spn.GetBalance(ctx, p.actor, tok)
 }
 
+func (p *Provider) RetryDealPublishing(propcid cid.Cid) error {
+	return p.deals.Send(propcid, storagemarket.ProviderEventRestart)
+}
+
 // ListLocalDeals lists deals processed by this storage provider
 func (p *Provider) ListLocalDeals() ([]storagemarket.MinerDeal, error) {
 	var out []storagemarket.MinerDeal

storagemarket/impl/providerstates/provider_states.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log/v2"
@@ -284,6 +285,11 @@ func PublishDeal(ctx fsm.Context, environment ProviderDealEnvironment, deal stor
 
 	mcid, err := environment.Node().PublishDeals(ctx.Context(), smDeal)
 	if err != nil {
+		if strings.Contains(err.Error(), "not enough funds") {
+			log.Warnf("publishing deal failed due to lack of funds: %s", err)
+
+			return nil
+		}
 		return ctx.Trigger(storagemarket.ProviderEventNodeErrored, xerrors.Errorf("publishing deal: %w", err))
 	}
 

storagemarket/impl/providerstates/provider_states_test.go

@@ -530,6 +530,15 @@ func TestPublishDeal(t *testing.T) {
 				tut.AssertDealState(t, storagemarket.StorageDealPublishing, deal.State)
 			},
 		},
+		"PublishDealsErrors returns not enough funds error": {
+			nodeParams: nodeParams{
+				PublishDealsError: errors.New("not enough funds"),
+			},
+			dealInspector: func(t *testing.T, deal storagemarket.MinerDeal, env *fakeEnvironment) {
+				tut.AssertDealState(t, storagemarket.StorageDealPublish, deal.State)
+				require.Equal(t, "", deal.Message)
+			},
+		},
 		"PublishDealsErrors errors": {
 			nodeParams: nodeParams{
 				PublishDealsError: errors.New("could not post to chain"),

storagemarket/provider.go

@@ -50,4 +50,6 @@ type StorageProvider interface {
 
 	// SubscribeToEvents listens for events that happen related to storage deals on a provider
 	SubscribeToEvents(subscriber ProviderSubscriber) shared.Unsubscribe
+
+	RetryDealPublishing(propCid cid.Cid) error
 }