undo config

LexLuthr · LexLuthr · commit abb7d7e6ee85 · 2024-10-05T15:51:51.000+04:00
diff --git a/gql/resolver_ipni.go b/gql/resolver_ipni.go
@@ -229,7 +229,3 @@ func (r *resolver) IpniDistanceFromLatestAd(ctx context.Context, args struct {
 
 	return count, nil
 }
-
-func (r *resolver) IpniRemovedAllAdsStatus(ctx context.Context) (bool, error) {
-	return r.idxProvWrapper.RemoveAllStatus(ctx), nil
-}
diff --git a/gql/schema.graphql b/gql/schema.graphql
@@ -652,9 +652,6 @@ type RootQuery {
 
   """Get the latest IPNI advertisemen"""
   ipniDistanceFromLatestAd(LatestAdcid: String!, Adcid: String!): Int!
-
-  """Get the IPNI Remove All Status"""
-  ipniRemovedAllAdsStatus: Boolean!
 }
 
 type RootMutation {
diff --git a/indexprovider/wrapper.go b/indexprovider/wrapper.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"time"
 
 	"github.com/filecoin-project/boost/lib/legacy"
 	"github.com/filecoin-project/boost/storagemarket/types/legacytypes"
@@ -72,7 +71,6 @@ type Wrapper struct {
 	bitswapEnabled bool
 	httpEnabled    bool
 	stop           context.CancelFunc
-	removeAllAds   bool
 }
 
 func NewWrapper(provAddr address.Address, cfg *config.Boost) func(lc fx.Lifecycle, h host.Host, r repo.LockedRepo, directDealsDB *db.DirectDealsDB, dealsDB *db.DealsDB,
@@ -129,11 +127,7 @@ func (w *Wrapper) Start(_ context.Context) {
 
 	log.Info("starting index provider")
 
-	if w.cfg.CurioMigration.Enable {
-		go w.tryAnnounceRemoveAll(runCtx)
-	} else {
-		go w.checkForUpdates(runCtx)
-	}
+	go w.checkForUpdates(runCtx)
 }
 
 func (w *Wrapper) checkForUpdates(ctx context.Context) {
@@ -922,30 +916,3 @@ func (w *Wrapper) AnnounceRemoveAll(ctx context.Context) ([]cid.Cid, error) {
 	return newAds, nil
 
 }
-
-func (w *Wrapper) tryAnnounceRemoveAll(ctx context.Context) {
-	ticker := time.NewTicker(time.Minute)
-
-	for {
-		select {
-		case <-ticker.C:
-			out, err := w.AnnounceRemoveAll(ctx)
-			if err != nil {
-				log.Errorw("error while announcing remove all", "err", err)
-				continue
-			}
-			if len(out) > 0 {
-				continue
-			}
-			log.Debugw("Cleaned up all the IPNI ads")
-			w.removeAllAds = true
-			return
-		case <-ctx.Done():
-			return
-		}
-	}
-}
-
-func (w *Wrapper) RemoveAllStatus(ctx context.Context) bool {
-	return w.removeAllAds
-}
diff --git a/node/config/def.go b/node/config/def.go
@@ -170,9 +170,6 @@ func DefaultBoost() *Boost {
 			MaxDealsPerPublishMsg: 8,
 			MaxPublishDealsFee:    types.MustParseFIL("0.05"),
 		},
-		CurioMigration: CurioMigration{
-			Enable: false,
-		},
 	}
 	return cfg
 }
diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go
diff --git a/node/config/migrate.go b/node/config/migrate.go
@@ -15,7 +15,7 @@ var log = logging.Logger("cfg")
 
 // CurrentVersion is the config version expected by Boost.
 // We need to migrate the config file to this version.
-const CurrentVersion = 7
+const CurrentVersion = 6
 
 type migrateUpFn = func(cfgPath string) (string, error)
 
@@ -26,7 +26,6 @@ var migrations = []migrateUpFn{
 	v3Tov4, // index 3 => version 4
 	v4Tov5, // index 4 => version 5
 	v5Tov6, // index 5 => version 6
-	v6Tov7, // index 6 => version 7
 }
 
 // This struct is used to get the config file version
diff --git a/node/config/types.go b/node/config/types.go
@@ -51,7 +51,6 @@ type Boost struct {
 	HttpDownload        HttpDownloadConfig
 	Retrievals          RetrievalConfig
 	IndexProvider       IndexProviderConfig
-	CurioMigration      CurioMigration
 }
 
 type WalletsConfig struct {
@@ -400,8 +399,3 @@ type DealPublishConfig struct {
 	// The maximum fee to pay when sending the PublishStorageDeals message
 	MaxPublishDealsFee types.FIL
 }
-
-type CurioMigration struct {
-	// Enable limits the Boost functionality to prepare for the migration
-	Enable bool
-}
diff --git a/node/config/v6_to_v7.go b/node/config/v6_to_v7.go
diff --git a/node/modules/directdeals.go b/node/modules/directdeals.go
@@ -34,7 +34,6 @@ func NewDirectDealsProvider(provAddr address.Address, cfg *config.Boost) func(lc
 		ddpCfg := storagemarket.DDPConfig{
 			StartEpochSealingBuffer: abi.ChainEpoch(cfg.Dealmaking.StartEpochSealingBuffer),
 			RemoteCommp:             cfg.Dealmaking.RemoteCommp,
-			CurioMigration:          cfg.CurioMigration.Enable,
 		}
 
 		prov := storagemarket.NewDirectDealsProvider(ddpCfg, provAddr, fullnodeApi, secb, commpc, commpt, sps, directDealsDB, dl, piecedirectory, ip)
diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go
@@ -486,7 +486,6 @@ func NewStorageMarketProvider(provAddr address.Address, cfg *config.Boost) func(
 			DealLogDurationDays:         cfg.Dealmaking.DealLogDurationDays,
 			StorageFilter:               cfg.Dealmaking.Filter,
 			SealingPipelineCacheTimeout: time.Duration(cfg.Dealmaking.SealingPipelineCacheTimeout),
-			CurioMigration:              cfg.CurioMigration.Enable,
 		}
 		dl := logs.NewDealLogger(logsDB)
 		tspt := httptransport.New(h, dl, httptransport.NChunksOpt(cfg.HttpDownload.NChunks), httptransport.AllowPrivateIPsOpt(cfg.HttpDownload.AllowPrivateIPs))
diff --git a/react/src/Ipni.js b/react/src/Ipni.js
@@ -6,7 +6,6 @@ import {
     IpniProviderInfoQuery,
     IpniLatestAdQuery,
     IpniDistanceFromLatestAdQuery,
-    IpniRemovedAllAdsStatus,
 } from "./gql";
 import moment from "moment";
 import React, {useEffect, useState} from "react";
@@ -90,7 +89,6 @@ function ProviderIpniInfoRender(props){
             adcid: adCid
         }
     })
-    const publishedRemoveAll = useQuery(IpniRemovedAllAdsStatus)
     return <div className="ipni-prov-info">
         <h3>Provider Indexer Info</h3>
         <div className="subtitle">
@@ -131,12 +129,6 @@ function ProviderIpniInfoRender(props){
                     <span className="aux">({moment(data.LastErrorTime).fromNow()} ago)</span>
                 </td>
             </tr>
-            <tr>
-                <th>Published Removal Ads for Curio Migration</th>
-                <td>
-                    {publishedRemoveAll.data ? publishedRemoveAll.data: ''}
-                </td>
-            </tr>
             </tbody>
         </table>
     </div>
diff --git a/react/src/gql.js b/react/src/gql.js
@@ -880,12 +880,6 @@ const IpniDistanceFromLatestAdQuery = gql`
     }
 `;
 
-const IpniRemovedAllAdsStatus = gql`
-    query AppIpniRemovedAllAdsStatusQuery{
-        ipniRemovedAllAdsStatus
-    }
-`;
-
 export {
     gqlClient,
     EpochQuery,
@@ -937,5 +931,4 @@ export {
     StorageAskQuery,
     PublishPendingDealsMutation,
     PiecePayloadCidsQuery,
-    IpniRemovedAllAdsStatus,
 }
diff --git a/storagemarket/direct_deals_provider.go b/storagemarket/direct_deals_provider.go
@@ -44,7 +44,6 @@ type DDPConfig struct {
 	// Minimum start epoch buffer to give time for sealing of sector with deal
 	StartEpochSealingBuffer abi.ChainEpoch
 	Curio                   bool
-	CurioMigration          bool
 }
 
 type DirectDealsProvider struct {
@@ -182,9 +181,6 @@ func (ddp *DirectDealsProvider) Accept(ctx context.Context, entry *types.DirectD
 }
 
 func (ddp *DirectDealsProvider) Import(ctx context.Context, params smtypes.DirectDealParams) (*api.ProviderDealRejectionInfo, error) {
-	if ddp.config.CurioMigration {
-		return &api.ProviderDealRejectionInfo{Reason: "Boost is migrating to Curio"}, nil
-	}
 	piececid := params.PieceCid.String()
 	clientAddr := params.ClientAddr.String()
 	log.Infow("received direct data import", "piececid", piececid, "filepath", params.FilePath, "clientAddr", clientAddr, "allocationId", params.AllocationID)
diff --git a/storagemarket/provider.go b/storagemarket/provider.go
@@ -84,7 +84,6 @@ type Config struct {
 	SealingPipelineCacheTimeout time.Duration
 	StorageFilter               string
 	Curio                       bool
-	CurioMigration              bool
 }
 
 var log = logging.Logger("boost-provider")
@@ -251,9 +250,6 @@ func (p *Provider) GetAsk() *legacytypes.SignedStorageAsk {
 // an offline deal (the deal must already have been proposed by the client)
 func (p *Provider) ImportOfflineDealData(ctx context.Context, dealUuid uuid.UUID, filePath string, delAfterImport bool) (pi *api.ProviderDealRejectionInfo, err error) {
 	p.dealLogger.Infow(dealUuid, "import data for offline deal", "filepath", filePath, "delete after import", delAfterImport)
-	if p.config.CurioMigration {
-		return &api.ProviderDealRejectionInfo{Reason: "Boost is migrating to Curio"}, nil
-	}
 
 	// db should already have a deal with this uuid as the deal proposal should have been made beforehand
 	ds, err := p.dealsDB.ByID(p.ctx, dealUuid)
@@ -297,9 +293,6 @@ func (p *Provider) ImportOfflineDealData(ctx context.Context, dealUuid uuid.UUID
 // ExecuteDeal is called when the Storage Provider receives a deal proposal
 // from the network
 func (p *Provider) ExecuteDeal(ctx context.Context, dp *types.DealParams, clientPeer peer.ID) (*api.ProviderDealRejectionInfo, error) {
-	if p.config.CurioMigration {
-		return &api.ProviderDealRejectionInfo{Reason: "Boost is migrating to Curio"}, nil
-	}
 	ctx, span := tracing.Tracer.Start(ctx, "Provider.ExecuteLibp2pDeal")
 	defer span.End()
 

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,3 @@ func (r *resolver) IpniDistanceFromLatestAd(ctx context.Context, args struct {`
`229`	`229`
`230`	`230`	`return count, nil`
`231`	`231`	`}`
`232`		`-`
`233`		`-func (r *resolver) IpniRemovedAllAdsStatus(ctx context.Context) (bool, error) {`
`234`		`- return r.idxProvWrapper.RemoveAllStatus(ctx), nil`
`235`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -652,9 +652,6 @@ type RootQuery {`
`652`	`652`
`653`	`653`	`"""Get the latest IPNI advertisemen"""`
`654`	`654`	`ipniDistanceFromLatestAd(LatestAdcid: String!, Adcid: String!): Int!`
`655`		`-`
`656`		`- """Get the IPNI Remove All Status"""`
`657`		`- ipniRemovedAllAdsStatus: Boolean!`
`658`	`655`	`}`
`659`	`656`
`660`	`657`	`type RootMutation {`
Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,6 @@ func DefaultBoost() *Boost {`
`170`	`170`	`MaxDealsPerPublishMsg: 8,`
`171`	`171`	`MaxPublishDealsFee: types.MustParseFIL("0.05"),`
`172`	`172`	`},`
`173`		`- CurioMigration: CurioMigration{`
`174`		`- Enable: false,`
`175`		`- },`
`176`	`173`	`}`
`177`	`174`	`return cfg`
`178`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ func NewDirectDealsProvider(provAddr address.Address, cfg *config.Boost) func(lc`
`34`	`34`	`ddpCfg := storagemarket.DDPConfig{`
`35`	`35`	`StartEpochSealingBuffer: abi.ChainEpoch(cfg.Dealmaking.StartEpochSealingBuffer),`
`36`	`36`	`RemoteCommp: cfg.Dealmaking.RemoteCommp,`
`37`		`- CurioMigration: cfg.CurioMigration.Enable,`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`prov := storagemarket.NewDirectDealsProvider(ddpCfg, provAddr, fullnodeApi, secb, commpc, commpt, sps, directDealsDB, dl, piecedirectory, ip)`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,6 @@ func NewStorageMarketProvider(provAddr address.Address, cfg *config.Boost) func(`
`486`	`486`	`DealLogDurationDays: cfg.Dealmaking.DealLogDurationDays,`
`487`	`487`	`StorageFilter: cfg.Dealmaking.Filter,`
`488`	`488`	`SealingPipelineCacheTimeout: time.Duration(cfg.Dealmaking.SealingPipelineCacheTimeout),`
`489`		`- CurioMigration: cfg.CurioMigration.Enable,`
`490`	`489`	`}`
`491`	`490`	`dl := logs.NewDealLogger(logsDB)`
`492`	`491`	`tspt := httptransport.New(h, dl, httptransport.NChunksOpt(cfg.HttpDownload.NChunks), httptransport.AllowPrivateIPsOpt(cfg.HttpDownload.AllowPrivateIPs))`