diff --git a/cmd/droplet/run.go b/cmd/droplet/run.go index 8c181272..51596d5b 100644 --- a/cmd/droplet/run.go +++ b/cmd/droplet/run.go @@ -248,10 +248,7 @@ func runDaemon(cctx *cli.Context) error { if err = router.Handle("/resource", rpc.NewPieceStorageServer(resAPI.PieceStorageMgr)).GetError(); err != nil { return fmt.Errorf("handle 'resource' failed: %w", err) } - httpRetrievalServer, err := httpretrieval.NewServer(&cfg.PieceStorage) - if err != nil { - return err - } + httpRetrievalServer := httpretrieval.NewServer(resAPI.PieceStorageMgr) var iMarket marketapiV1.IMarketStruct permission.PermissionProxy(marketapiV1.IMarket(resAPI), &iMarket) diff --git a/retrievalprovider/httpretrieval/server.go b/retrievalprovider/httpretrieval/server.go index c250c228..b2fa6dc0 100644 --- a/retrievalprovider/httpretrieval/server.go +++ b/retrievalprovider/httpretrieval/server.go @@ -9,7 +9,6 @@ import ( "github.com/NYTimes/gziphandler" "github.com/filecoin-project/venus/venus-shared/types" - "github.com/ipfs-force-community/droplet/v2/config" "github.com/ipfs-force-community/droplet/v2/piecestorage" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" @@ -19,17 +18,11 @@ import ( var log = logging.Logger("httpserver") type Server struct { - // path string pieceMgr *piecestorage.PieceStorageManager } -func NewServer(cfg *config.PieceStorage) (*Server, error) { - pieceMgr, err := piecestorage.NewPieceStorageManager(cfg) - if err != nil { - return nil, err - } - - return &Server{pieceMgr: pieceMgr}, nil +func NewServer(pieceMgr *piecestorage.PieceStorageManager) *Server { + return &Server{pieceMgr: pieceMgr} } func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { diff --git a/retrievalprovider/httpretrieval/server_test.go b/retrievalprovider/httpretrieval/server_test.go index 0956e010..85cab2fa 100644 --- a/retrievalprovider/httpretrieval/server_test.go +++ b/retrievalprovider/httpretrieval/server_test.go @@ -15,6 +15,7 @@ import ( "github.com/gorilla/mux" "github.com/ipfs-force-community/droplet/v2/config" + "github.com/ipfs-force-community/droplet/v2/piecestorage" "github.com/stretchr/testify/assert" ) @@ -76,8 +77,9 @@ func TestRetrievalByPiece(t *testing.T) { assert.NoError(t, err) assert.NoError(t, f.Close()) - s, err := NewServer(&cfg.PieceStorage) + pieceStorage, err := piecestorage.NewPieceStorageManager(&cfg.PieceStorage) assert.NoError(t, err) + s := NewServer(pieceStorage) port := "34897" startHTTPServer(ctx, t, port, s)