@@ -129,11 +129,11 @@ func OnlineProviders(useStrategicProviding bool, reprovideStrategy string, repro
129129 var keyProvider fx.Option
130130 switch reprovideStrategy {
131131 case "all" , "" :
132- keyProvider = fx .Provide (provider . NewBlockstoreProvider )
132+ keyProvider = fx .Provide (newProvidingStrategy ( false , false ) )
133133 case "roots" :
134- keyProvider = fx .Provide (pinnedProviderStrategy ( true ))
134+ keyProvider = fx .Provide (newProvidingStrategy ( true , true ))
135135 case "pinned" :
136- keyProvider = fx .Provide (pinnedProviderStrategy ( false ))
136+ keyProvider = fx .Provide (newProvidingStrategy ( true , false ))
137137 default :
138138 return fx .Error (fmt .Errorf ("unknown reprovider strategy %q" , reprovideStrategy ))
139139 }
@@ -149,13 +149,26 @@ func OfflineProviders() fx.Option {
149149 return fx .Provide (provider .NewNoopProvider )
150150}
151151
152- func pinnedProviderStrategy ( onlyRoots bool ) interface {} {
152+ func newProvidingStrategy ( onlyPinned , onlyRoots bool ) interface {} {
153153 type input struct {
154154 fx.In
155155 Pinner pin.Pinner
156+ Blockstore blockstore.Blockstore
156157 IPLDFetcher fetcher.Factory `name:"ipldFetcher"`
157158 }
158159 return func (in input ) provider.KeyChanFunc {
159- return provider .NewPinnedProvider (onlyRoots , in .Pinner , in .IPLDFetcher )
160+ if onlyRoots {
161+ return provider .NewPinnedProvider (true , in .Pinner , in .IPLDFetcher )
162+ }
163+
164+ var later provider.KeyChanFunc
165+ if onlyPinned {
166+ later = provider .NewPinnedProvider (false , in .Pinner , in .IPLDFetcher )
167+ } else {
168+ later = provider .NewBlockstoreProvider (in .Blockstore )
169+ }
170+
171+ roots := provider .NewPinnedProvider (true , in .Pinner , in .IPLDFetcher )
172+ return provider .NewPrioritizedProvider (roots , later )
160173 }
161174}
0 commit comments