refactor: merge from main into lid branch (#1339)

filecoin-project · Jul 20, 2023 · d97805a · d97805a
1 parent 94c4a27
commit d97805a
Show file tree

Hide file tree

Showing 36 changed files with 378 additions and 353 deletions.
diff --git a/api/api.go b/api/api.go
@@ -8,8 +8,6 @@ import (
 	smtypes "github.com/filecoin-project/boost/storagemarket/types"
 	"github.com/filecoin-project/go-address"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 	lapi "github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/types"

diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
@@ -20,7 +20,7 @@ import (
 	"github.com/filecoin-project/go-jsonrpc/auth"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-graphsync"
+	graphsync "github.com/ipfs/go-graphsync"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/metrics"

diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/build/openrpc/boost.json.gz b/build/openrpc/boost.json.gz
diff --git a/build/version.go b/build/version.go
@@ -2,7 +2,7 @@ package build
 
 var CurrentCommit string
 
-const BuildVersion = "2.0.0-rc1"
+const BuildVersion = "1.6.2-rc1"
 
 func UserVersion() string {
 	return BuildVersion + CurrentCommit

diff --git a/cmd/boost/provider_cmd.go b/cmd/boost/provider_cmd.go
@@ -13,6 +13,8 @@ import (
 	"github.com/filecoin-project/boost/retrievalmarket/lp2pimpl"
 	"github.com/filecoin-project/boostd-data/shared/cliutil"
 	"github.com/filecoin-project/go-address"
+	// TODO: This multiaddr util library should probably live in its own repo
+	multiaddrutil "github.com/filecoin-project/go-legs/httpsync/multiaddr"
 	"github.com/filecoin-project/lotus/chain/types"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/go-cid"

diff --git a/cmd/boost/retrieve_cmd.go b/cmd/boost/retrieve_cmd.go
@@ -27,7 +27,7 @@ import (
 	levelds "github.com/ipfs/go-ds-leveldb"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
-	files "github.com/ipfs/go-ipfs-files"
+	"github.com/ipfs/go-libipfs/files"
 	"github.com/ipfs/go-merkledag"
 	unixfile "github.com/ipfs/go-unixfs/file"
 	"github.com/ipld/go-car"

diff --git a/cmd/booster-http/http_test.go b/cmd/booster-http/http_test.go
@@ -11,9 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/filecoin-project/boostd-data/model"
-
 	mocks_booster_http "github.com/filecoin-project/boost/cmd/booster-http/mocks"
+	"github.com/filecoin-project/boostd-data/model"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

diff --git a/cmd/booster-http/server.go b/cmd/booster-http/server.go
@@ -18,7 +18,6 @@ import (
 	"github.com/filecoin-project/boostd-data/model"
 	"github.com/filecoin-project/boostd-data/shared/tracing"
 	"github.com/filecoin-project/dagstore/mount"
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/hashicorp/go-multierror"
 	"github.com/ipfs/boxo/blockservice"

diff --git a/cmd/migrate-lid/migrate_lid.go b/cmd/migrate-lid/migrate_lid.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"sort"
@@ -589,7 +588,7 @@ type idxPath struct {
 }
 
 func getIndexPaths(pathDir string) ([]idxPath, error) {
-	files, err := ioutil.ReadDir(pathDir)
+	files, err := os.ReadDir(pathDir)
 	if err != nil {
 		return nil, err
 	}