both StoredAsk and storage Provider are scoped to a single miner

storagemarket/impl/provider.go

@@ -35,7 +35,7 @@ var DefaultDealAcceptanceBuffer = abi.ChainEpoch(100)
 var _ storagemarket.StorageProvider = &Provider{}
 
 type StoredAsk interface {
-	GetAsk(address.Address) *storagemarket.SignedStorageAsk
+	GetAsk() *storagemarket.SignedStorageAsk
 	SetAsk(price abi.TokenAmount, duration abi.ChainEpoch, options ...storagemarket.StorageAskOption) error
 }
 
@@ -259,8 +259,8 @@ func (p *Provider) ImportDataForDeal(ctx context.Context, propCid cid.Cid, data
 
 }
 
-func (p *Provider) GetAsk(addr address.Address) *storagemarket.SignedStorageAsk {
-	return p.storedAsk.GetAsk(addr)
+func (p *Provider) GetAsk() *storagemarket.SignedStorageAsk {
+	return p.storedAsk.GetAsk()
 }
 
 func (p *Provider) ListDeals(ctx context.Context) ([]storagemarket.StorageDeal, error) {
@@ -327,8 +327,15 @@ func (p *Provider) HandleAskStream(s network.StorageAskStream) {
 		return
 	}
 
+	var ask *storagemarket.SignedStorageAsk
+	if p.actor != ar.Miner {
+		log.Warnf("storage provider for address %s receive ask for miner with address %s", p.actor, ar.Miner)
+	} else {
+		ask = p.storedAsk.GetAsk()
+	}
+
 	resp := network.AskResponse{
-		Ask: p.storedAsk.GetAsk(ar.Miner),
+		Ask: ask,
 	}
 
 	if err := s.WriteAskResponse(resp); err != nil {
@@ -446,7 +453,7 @@ func (p *providerDealEnvironment) Node() storagemarket.StorageProviderNode {
 }
 
 func (p *providerDealEnvironment) Ask() storagemarket.StorageAsk {
-	sask := p.p.storedAsk.GetAsk(p.p.actor)
+	sask := p.p.storedAsk.GetAsk()
 	if sask == nil {
 		return storagemarket.StorageAskUndefined
 	}

storagemarket/impl/storedask/storedask.go

@@ -101,12 +101,9 @@ func (s *StoredAsk) SetAsk(price abi.TokenAmount, duration abi.ChainEpoch, optio
 
 }
 
-func (s *StoredAsk) GetAsk(addr address.Address) *storagemarket.SignedStorageAsk {
+func (s *StoredAsk) GetAsk() *storagemarket.SignedStorageAsk {
 	s.askLk.RLock()
 	defer s.askLk.RUnlock()
-	if s.actor != addr {
-		return nil
-	}
 	if s.ask == nil {
 		return nil
 	}

storagemarket/impl/storedask/storedask_test.go

@@ -29,28 +29,22 @@ func TestStoredAsk(t *testing.T) {
 	testPrice := abi.NewTokenAmount(1000000000)
 	testDuration := abi.ChainEpoch(200)
 	t.Run("auto initializing", func(t *testing.T) {
-		ask := storedAsk.GetAsk(actor)
+		ask := storedAsk.GetAsk()
 		require.NotNil(t, ask)
 	})
 	t.Run("setting ask price", func(t *testing.T) {
 		minPieceSize := abi.PaddedPieceSize(1024)
 		err := storedAsk.SetAsk(testPrice, testDuration, storagemarket.MinPieceSize(minPieceSize))
 		require.NoError(t, err)
-		ask := storedAsk.GetAsk(actor)
+		ask := storedAsk.GetAsk()
 		require.Equal(t, ask.Ask.Price, testPrice)
 		require.Equal(t, ask.Ask.Expiry-ask.Ask.Timestamp, testDuration)
 		require.Equal(t, ask.Ask.MinPieceSize, minPieceSize)
 	})
-	t.Run("querying incorrect address", func(t *testing.T) {
-		otherAddr, err := address.NewActorAddress([]byte("other"))
-		require.NoError(t, err)
-		ask := storedAsk.GetAsk(otherAddr)
-		require.Nil(t, ask)
-	})
 	t.Run("reloading stored ask from disk", func(t *testing.T) {
 		storedAsk2, err := storedask.NewStoredAsk(ds, datastore.NewKey("latest-ask"), spn, actor)
 		require.NoError(t, err)
-		ask := storedAsk2.GetAsk(actor)
+		ask := storedAsk2.GetAsk()
 		require.Equal(t, ask.Ask.Price, testPrice)
 		require.Equal(t, ask.Ask.Expiry-ask.Ask.Timestamp, testDuration)
 	})

storagemarket/types.go

@@ -412,7 +412,7 @@ type StorageProvider interface {
 	SetAsk(price abi.TokenAmount, duration abi.ChainEpoch, options ...StorageAskOption) error
 
 	// GetAsk returns the storage miner's ask, or nil if one does not exist.
-	GetAsk(addr address.Address) *SignedStorageAsk
+	GetAsk() *SignedStorageAsk
 
 	// ListDeals lists on-chain deals associated with this storage provider
 	ListDeals(ctx context.Context) ([]StorageDeal, error)