chore: remove redundant import prefixes

filecoin-project · Jun 15, 2022 · 05cdeb8 · 05cdeb8
1 parent 39cede9
commit 05cdeb8
Show file tree

Hide file tree

Showing 137 changed files with 171 additions and 171 deletions.
diff --git a/api/api_net.go b/api/api_net.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	metrics "github.com/libp2p/go-libp2p-core/metrics"
+	"github.com/libp2p/go-libp2p-core/metrics"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/protocol"

diff --git a/api/api_storage.go b/api/api_storage.go
@@ -24,7 +24,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/storage/pipeline/sealiface"
 	"github.com/filecoin-project/lotus/storage/sealer/fsutil"
-	storiface "github.com/filecoin-project/lotus/storage/sealer/storiface"
+	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
 
 //                       MODIFYING THE API INTERFACE

diff --git a/api/api_worker.go b/api/api_worker.go
@@ -11,7 +11,7 @@ import (
 	"github.com/filecoin-project/specs-storage/storage"
 
 	"github.com/filecoin-project/lotus/storage/sealer/sealtasks"
-	storiface "github.com/filecoin-project/lotus/storage/sealer/storiface"
+	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
 
 //                       MODIFYING THE API INTERFACE

diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
@@ -27,7 +27,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
-	filestore "github.com/filecoin-project/go-fil-markets/filestore"
+	"github.com/filecoin-project/go-fil-markets/filestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-jsonrpc/auth"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -43,7 +43,7 @@ import (
 	"github.com/filecoin-project/lotus/node/repo/imports"
 	sealing "github.com/filecoin-project/lotus/storage/pipeline"
 	"github.com/filecoin-project/lotus/storage/sealer/sealtasks"
-	storiface "github.com/filecoin-project/lotus/storage/sealer/storiface"
+	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
 
 var ExampleValues = map[reflect.Type]interface{}{

diff --git a/api/version.go b/api/version.go
@@ -3,7 +3,7 @@ package api
 import (
 	"fmt"
 
-	xerrors "golang.org/x/xerrors"
+	"golang.org/x/xerrors"
 )
 
 type Version uint32

diff --git a/blockstore/badger/blockstore_test.go b/blockstore/badger/blockstore_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 

diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go
@@ -3,7 +3,7 @@ package blockstore
 import (
 	"context"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	logging "github.com/ipfs/go-log/v2"

diff --git a/blockstore/discard.go b/blockstore/discard.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 )
 
 var _ Blockstore = (*discardstore)(nil)

diff --git a/blockstore/idstore.go b/blockstore/idstore.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	mh "github.com/multiformats/go-multihash"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/splitstore/checkpoint.go b/blockstore/splitstore/checkpoint.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	mh "github.com/multiformats/go-multihash"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/splitstore/coldset.go b/blockstore/splitstore/coldset.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/splitstore/debug.go b/blockstore/splitstore/debug.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"go.uber.org/multierr"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/splitstore/markset.go b/blockstore/splitstore/markset.go
@@ -3,7 +3,7 @@ package splitstore
 import (
 	"errors"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/splitstore/markset_badger.go b/blockstore/splitstore/markset_badger.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/dgraph-io/badger/v2"
 	"github.com/dgraph-io/badger/v2/options"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"go.uber.org/zap"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/splitstore/markset_map.go b/blockstore/splitstore/markset_map.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/splitstore/markset_test.go b/blockstore/splitstore/markset_test.go
@@ -4,7 +4,7 @@ package splitstore
 import (
 	"testing"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multihash"
 )
 

diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	dstore "github.com/ipfs/go-datastore"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"

diff --git a/blockstore/splitstore/splitstore_check.go b/blockstore/splitstore/splitstore_check.go
@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 
 	bstore "github.com/filecoin-project/lotus/blockstore"

diff --git a/blockstore/splitstore/splitstore_compact.go b/blockstore/splitstore/splitstore_compact.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"go.opencensus.io/stats"
 	"golang.org/x/sync/errgroup"

diff --git a/blockstore/splitstore/splitstore_expose.go b/blockstore/splitstore/splitstore_expose.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 
 	bstore "github.com/filecoin-project/lotus/blockstore"
 )

diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/splitstore/splitstore_test.go b/blockstore/splitstore/splitstore_test.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
-	datastore "github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	logging "github.com/ipfs/go-log/v2"
 	mh "github.com/multiformats/go-multihash"

diff --git a/blockstore/splitstore/splitstore_util.go b/blockstore/splitstore/splitstore_util.go
@@ -3,7 +3,7 @@ package splitstore
 import (
 	"encoding/binary"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	mh "github.com/multiformats/go-multihash"
 	"golang.org/x/xerrors"
 

diff --git a/blockstore/splitstore/splitstore_warmup.go b/blockstore/splitstore/splitstore_warmup.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"

diff --git a/blockstore/splitstore/visitor.go b/blockstore/splitstore/visitor.go
@@ -3,7 +3,7 @@ package splitstore
 import (
 	"sync"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 )
 
 // ObjectVisitor is an interface for deduplicating objects during walks

diff --git a/chain/actors/adt/store.go b/chain/actors/adt/store.go
@@ -5,7 +5,7 @@ import (
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 
-	adt "github.com/filecoin-project/specs-actors/actors/util/adt"
+	"github.com/filecoin-project/specs-actors/actors/util/adt"
 )
 
 type Store interface {

diff --git a/chain/actors/builtin/paych/paych.go b/chain/actors/builtin/paych/paych.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	big "github.com/filecoin-project/go-state-types/big"
+	"github.com/filecoin-project/go-state-types/big"
 	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	"github.com/filecoin-project/go-state-types/cbor"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"

diff --git a/chain/actors/manifest.go b/chain/actors/manifest.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"golang.org/x/xerrors"
 

diff --git a/chain/consensus/filcns/filecoin.go b/chain/consensus/filcns/filecoin.go
@@ -42,7 +42,7 @@ import (
 	"github.com/filecoin-project/lotus/lib/async"
 	"github.com/filecoin-project/lotus/lib/sigs"
 	"github.com/filecoin-project/lotus/metrics"
-	ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
+	"github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
 )
 
 var log = logging.Logger("fil-consensus")

diff --git a/chain/exchange/peer_tracker.go b/chain/exchange/peer_tracker.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	host "github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"go.uber.org/fx"
 

diff --git a/chain/gen/gen.go b/chain/gen/gen.go
@@ -43,7 +43,7 @@ import (
 	"github.com/filecoin-project/lotus/genesis"
 	"github.com/filecoin-project/lotus/journal"
 	"github.com/filecoin-project/lotus/node/repo"
-	ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
+	"github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
 )
 
 const msgsPerBlock = 20

diff --git a/chain/state/statetree_test.go b/chain/state/statetree_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 
-	address "github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 

diff --git a/chain/stmgr/actors.go b/chain/stmgr/actors.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"os"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"

diff --git a/chain/store/index_test.go b/chain/store/index_test.go
@@ -6,7 +6,7 @@ import (
 	"context"
 	"testing"
 
-	datastore "github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
 	"github.com/stretchr/testify/assert"
 

diff --git a/chain/store/store_test.go b/chain/store/store_test.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"testing"
 
-	datastore "github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"

diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go
@@ -12,14 +12,14 @@ import (
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log/v2"
-	connmgr "github.com/libp2p/go-libp2p-core/connmgr"
+	"github.com/libp2p/go-libp2p-core/connmgr"
 	"github.com/libp2p/go-libp2p-core/peer"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/tag"
 	"golang.org/x/xerrors"
 
-	address "github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-legs/dtsync"
 
 	"github.com/filecoin-project/lotus/build"

diff --git a/chain/sync_manager.go b/chain/sync_manager.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 
 	"github.com/filecoin-project/go-address"
 

diff --git a/chain/types/blockheader.go b/chain/types/blockheader.go
@@ -7,7 +7,7 @@ import (
 	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/minio/blake2b-simd"
-	xerrors "golang.org/x/xerrors"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"

diff --git a/chain/types/blockheader_test.go b/chain/types/blockheader_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"

diff --git a/chain/types/message.go b/chain/types/message.go
@@ -7,7 +7,7 @@ import (
 
 	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	xerrors "golang.org/x/xerrors"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"

diff --git a/chain/types/vmcontext.go b/chain/types/vmcontext.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 
 	"github.com/filecoin-project/go-address"

diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go
@@ -27,7 +27,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/state"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/lib/sigs"
-	ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
+	"github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
 )
 
 func init() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"io"
     	"os"
-    	cid "github.com/ipfs/go-cid"
+    	"github.com/ipfs/go-cid"
     	"golang.org/x/xerrors"
     )
@@ Expand Down @@