Release v2.3.1 (#306)

* feat: upgrade libp2p (#303)

* feat: rm the QUIC dependence of go-libp2p-quic-transport temporarily

* feat: update golang version

* build: golang1.18 require a new format when there is a build in the first line

* feat: add bittorrent cmd

* feat[bittorrent]: add metainfo cmd

* feat[bittorrent]: add scrape and bencode cmds

* feat[bittorrent]: add download cmd

* feat: add some human-readable statistics

* feat: rm the file after download completed

* feat[bittorrent]: add bt serve cmd

* fix: getting metainfo support magnet

* ci: update go mod

* test: fix cmd test

* fix[bittorrent]: update the description of serveing

* feat: upgrade libp2p

* test: fix test case build err

* fix: context background change to TODO

* feat: dht prefix

* fix: peer can't bootstrap because of the dht protocol prefix

* fix: blockstore: block not found

* feat: upgrade dependency of ethereum

* feat: upgrade libp2p dependency

* feat: implement new method

* feat: update dependency

* feat: instead IDB58Decode of IDFromBytes

* style: format go code to pass github actions

* feat: don't force users to migrate old config

* feat: update resource manager base limit

* feat: increase connsInbound

* feat: change default resource manager

* fix: key serialize method changed

* test: new connmgr needs a grace period to 0 in test or else trim() will failed

* fix: routing changed to ProvideManyRouter in IpfsNode to avoid the fx inject it failed

* test: new transport upgrade

* fix: key serialize error and btfs add ctx

* test: rm coreunix test tmp

* feat: log resource limits exceeded as warning instead of error

* fix: peer string decode to peerID

* test: delay the sleep time so that the LAN can find all each other

* test: delay the code dht bootstrap time and timeout

* fix: add issue

* feat: update dashboard CID and version (#305)

* feat: update dashboard CID and version

---------

Co-authored-by: Shawn-Huang-Tron <107823650+Shawn-Huang-Tron@users.noreply.github.com>

CHANGELOG.md

@@ -194,8 +194,8 @@ The scripts in https://github.com/ipfs/go-ipfs-example-plugin have been updated
 - github.com/ipfs/go-path (v0.0.7 -> v0.0.8):
   - ResolveToLastNode no longer fetches nodes it does not need ([ipfs/go-path#30](https://github.com/ipfs/go-path/pull/30))
   - doc: add a lead maintainer
-- github.com/ipfs/interface-go-ipfs-core (v0.3.0 -> v0.4.0):
-  - Add ID formatting functions, used by various IPFS cli commands ([ipfs/interface-go-ipfs-core#65](https://github.com/ipfs/interface-go-ipfs-core/pull/65))
+- github.com/TRON-US/interface-go-btfs-core (v0.3.0 -> v0.4.0):
+  - Add ID formatting functions, used by various IPFS cli commands ([ipfs/interface-go-ipfs-core#65](https://github.com/TRON-US/interface-go-btfs-core/pull/65))
 - github.com/ipld/go-car (v0.1.0 -> v0.1.1-0.20200429200904-c222d793c339):
   - Update go-ipld-prime to the era of NodeAssembler. ([ipld/go-car#31](https://github.com/ipld/go-car/pull/31))
   - fix: update the cli tool's car dep ([ipld/go-car#30](https://github.com/ipld/go-car/pull/30))
@@ -728,13 +728,13 @@ Use-cases:
   - test: add Directory.ListNames test ([ipfs/go-mfs#81](https://github.com/ipfs/go-mfs/pull/81))
   - doc: add a lead maintainer
   - Update README.md with newer travis badge ([ipfs/go-mfs#78](https://github.com/ipfs/go-mfs/pull/78))
-- github.com/ipfs/interface-go-ipfs-core (v0.2.7 -> v0.3.0):
-  - add Pin.IsPinned(..) ([ipfs/interface-go-ipfs-core#50](https://github.com/ipfs/interface-go-ipfs-core/pull/50))
+- github.com/TRON-US/interface-go-btfs-core (v0.2.7 -> v0.3.0):
+  - add Pin.IsPinned(..) ([ipfs/interface-go-ipfs-core#50](https://github.com/TRON-US/interface-go-btfs-core/pull/50))
   - Add autocomment configuration
   - Add standard issue template
-  - extra time for dht spin-up ([ipfs/interface-go-ipfs-core#61](https://github.com/ipfs/interface-go-ipfs-core/pull/61))
-  - feat: make the CoreAPI expose a streaming pin interface ([ipfs/interface-go-ipfs-core#49](https://github.com/ipfs/interface-go-ipfs-core/pull/49))
-  - test: fail early on err to avoid an unrelated panic ([ipfs/interface-go-ipfs-core#57](https://github.com/ipfs/interface-go-ipfs-core/pull/57))
+  - extra time for dht spin-up ([ipfs/interface-go-ipfs-core#61](https://github.com/TRON-US/interface-go-btfs-core/pull/61))
+  - feat: make the CoreAPI expose a streaming pin interface ([ipfs/interface-go-ipfs-core#49](https://github.com/TRON-US/interface-go-btfs-core/pull/49))
+  - test: fail early on err to avoid an unrelated panic ([ipfs/interface-go-ipfs-core#57](https://github.com/TRON-US/interface-go-btfs-core/pull/57))
 - github.com/jbenet/go-is-domain (v1.0.3 -> v1.0.5):
   - Add OpenNIC domains to extended TLDs. ([jbenet/go-is-domain#15](https://github.com/jbenet/go-is-domain/pull/15))
   - feat: add .crypto and .zil from UnstoppableDomains ([jbenet/go-is-domain#17](https://github.com/jbenet/go-is-domain/pull/17))
@@ -1936,15 +1936,15 @@ As usual, this release contains several Windows specific fixes and improvements:
   - fix: return the correct error from RemoveChild ([ipfs/go-unixfs#76](https://github.com/ipfs/go-unixfs/pull/76))
   - update the the last go-merkledag ([ipfs/go-unixfs#75](https://github.com/ipfs/go-unixfs/pull/75))
   - fix: enumerate children ([ipfs/go-unixfs#74](https://github.com/ipfs/go-unixfs/pull/74))
-- github.com/ipfs/interface-go-ipfs-core (v0.0.8 -> v0.2.7):
-  - Add pin ls tests for indirect pin traversal and pin type precedence ([ipfs/interface-go-ipfs-core#47](https://github.com/ipfs/interface-go-ipfs-core/pull/47))
-  - fix(test): fix a flaky pubsub test ([ipfs/interface-go-ipfs-core#45](https://github.com/ipfs/interface-go-ipfs-core/pull/45))
-  - README: stub ([ipfs/interface-go-ipfs-core#44](https://github.com/ipfs/interface-go-ipfs-core/pull/44))
-  - test: test ReadAt if implemented ([ipfs/interface-go-ipfs-core#43](https://github.com/ipfs/interface-go-ipfs-core/pull/43))
-  - test: fix put with hash test ([ipfs/interface-go-ipfs-core#41](https://github.com/ipfs/interface-go-ipfs-core/pull/41))
-  - Bump go-libp2p-core, up test key size to 2048 ([ipfs/interface-go-ipfs-core#39](https://github.com/ipfs/interface-go-ipfs-core/pull/39))
-  - migrate to go-libp2p-core. ([ipfs/interface-go-ipfs-core#35](https://github.com/ipfs/interface-go-ipfs-core/pull/35))
-  - tests: expose TestSuite ([ipfs/interface-go-ipfs-core#34](https://github.com/ipfs/interface-go-ipfs-core/pull/34))
+- github.com/TRON-US/interface-go-btfs-core (v0.0.8 -> v0.2.7):
+  - Add pin ls tests for indirect pin traversal and pin type precedence ([ipfs/interface-go-ipfs-core#47](https://github.com/TRON-US/interface-go-btfs-core/pull/47))
+  - fix(test): fix a flaky pubsub test ([ipfs/interface-go-ipfs-core#45](https://github.com/TRON-US/interface-go-btfs-core/pull/45))
+  - README: stub ([ipfs/interface-go-ipfs-core#44](https://github.com/TRON-US/interface-go-btfs-core/pull/44))
+  - test: test ReadAt if implemented ([ipfs/interface-go-ipfs-core#43](https://github.com/TRON-US/interface-go-btfs-core/pull/43))
+  - test: fix put with hash test ([ipfs/interface-go-ipfs-core#41](https://github.com/TRON-US/interface-go-btfs-core/pull/41))
+  - Bump go-libp2p-core, up test key size to 2048 ([ipfs/interface-go-ipfs-core#39](https://github.com/TRON-US/interface-go-btfs-core/pull/39))
+  - migrate to go-libp2p-core. ([ipfs/interface-go-ipfs-core#35](https://github.com/TRON-US/interface-go-btfs-core/pull/35))
+  - tests: expose TestSuite ([ipfs/interface-go-ipfs-core#34](https://github.com/TRON-US/interface-go-btfs-core/pull/34))
 - github.com/libp2p/go-libp2p (v0.0.32 -> v0.8.2):
   - fix: keep observed addrs alive as long as their associated connections are alive ([libp2p/go-libp2p#899](https://github.com/libp2p/go-libp2p/pull/899))
   - fix: refactor logic for identifying connections ([libp2p/go-libp2p#898](https://github.com/libp2p/go-libp2p/pull/898))
@@ -2961,11 +2961,11 @@ go versions during builds.
   - include the path in path errors ([ipfs/go-path#28](https://github.com/ipfs/go-path/pull/28))
 - github.com/ipfs/go-unixfs (v0.0.4 -> v0.0.6):
   - chore: remove URL field ([ipfs/go-unixfs#72](https://github.com/ipfs/go-unixfs/pull/72))
-- github.com/ipfs/interface-go-ipfs-core (v0.0.6 -> v0.0.8):
-  - switch to base32 cidv1 by default ([ipfs/interface-go-ipfs-core#29](https://github.com/ipfs/interface-go-ipfs-core/pull/29))
-  - path: drop error from ParsePath ([ipfs/interface-go-ipfs-core#22](https://github.com/ipfs/interface-go-ipfs-core/pull/22))
-  - tests: fix a bunch of small test lints/issues ([ipfs/interface-go-ipfs-core#28](https://github.com/ipfs/interface-go-ipfs-core/pull/28))
-  - Update Pin.RmRecursive docs to clarify shared indirect pins are not removed ([ipfs/interface-go-ipfs-core#26](https://github.com/ipfs/interface-go-ipfs-core/pull/26))
+- github.com/TRON-US/interface-go-btfs-core (v0.0.6 -> v0.0.8):
+  - switch to base32 cidv1 by default ([ipfs/interface-go-ipfs-core#29](https://github.com/TRON-US/interface-go-btfs-core/pull/29))
+  - path: drop error from ParsePath ([ipfs/interface-go-ipfs-core#22](https://github.com/TRON-US/interface-go-btfs-core/pull/22))
+  - tests: fix a bunch of small test lints/issues ([ipfs/interface-go-ipfs-core#28](https://github.com/TRON-US/interface-go-btfs-core/pull/28))
+  - Update Pin.RmRecursive docs to clarify shared indirect pins are not removed ([ipfs/interface-go-ipfs-core#26](https://github.com/TRON-US/interface-go-btfs-core/pull/26))
 - github.com/libp2p/go-buffer-pool (v0.0.1 -> v0.0.2):
   - feat: add buffered writer ([libp2p/go-buffer-pool#9](https://github.com/libp2p/go-buffer-pool/pull/9))
 - github.com/libp2p/go-conn-security-multistream (v0.0.1 -> v0.0.2):
@@ -3449,12 +3449,12 @@ earlier on start.
 - github.com/ipfs/go-mfs:
   - Return node from FlushPath ([ipfs/go-mfs#72](https://github.com/ipfs/go-mfs/pull/72))
   - Wire up context to FlushPath ([ipfs/go-mfs#70](https://github.com/ipfs/go-mfs/pull/70))
-- github.com/ipfs/interface-go-ipfs-core:
-  - don't close the top-level addr ([ipfs/interface-go-ipfs-core#25](https://github.com/ipfs/interface-go-ipfs-core/pull/25))
-  - fix a bunch of small test "bugs" ([ipfs/interface-go-ipfs-core#24](https://github.com/ipfs/interface-go-ipfs-core/pull/24))
-  - remove Wrap ([ipfs/interface-go-ipfs-core#21](https://github.com/ipfs/interface-go-ipfs-core/pull/21))
-  - Unixfs.Wrap Fixes ([ipfs/interface-go-ipfs-core#10](https://github.com/ipfs/interface-go-ipfs-core/pull/10))
-  - tweak the Ls interface ([ipfs/interface-go-ipfs-core#14](https://github.com/ipfs/interface-go-ipfs-core/pull/14))
+- github.com/TRON-US/interface-go-btfs-core:
+  - don't close the top-level addr ([ipfs/interface-go-ipfs-core#25](https://github.com/TRON-US/interface-go-btfs-core/pull/25))
+  - fix a bunch of small test "bugs" ([ipfs/interface-go-ipfs-core#24](https://github.com/TRON-US/interface-go-btfs-core/pull/24))
+  - remove Wrap ([ipfs/interface-go-ipfs-core#21](https://github.com/TRON-US/interface-go-btfs-core/pull/21))
+  - Unixfs.Wrap Fixes ([ipfs/interface-go-ipfs-core#10](https://github.com/TRON-US/interface-go-btfs-core/pull/10))
+  - tweak the Ls interface ([ipfs/interface-go-ipfs-core#14](https://github.com/TRON-US/interface-go-btfs-core/pull/14))
 - github.com/libp2p/go-buffer-pool:
   - Enable tests ([libp2p/go-buffer-pool#6](https://github.com/libp2p/go-buffer-pool/pull/6))
 - github.com/libp2p/go-flow-metrics:
@@ -3814,7 +3814,7 @@ The next steps are:
    go-ipfs as a library.
 
 [ipfs/go-ipfs#4498]: https://github.com/ipfs/go-ipfs/issues/4498
-[ipfs/interface-go-ipfs-core]: https://github.com/ipfs/interface-go-ipfs-core
+[ipfs/interface-go-ipfs-core]: https://github.com/TRON-US/interface-go-btfs-core
 [ipfs/go-ipfs-http-client]: https://github.com/ipfs/go-ipfs-http-client
 [ipfs/go-ipfs-api]: https://github.com/ipfs/go-ipfs-http-client
 [daemon-plugin]: https://github.com/ipfs/go-ipfs/blob/master/docs/plugins.md#daemon

accounting/accounting_test.go

@@ -14,8 +14,9 @@ import (
 
 	"github.com/bittorrent/go-btfs/accounting"
 	"github.com/bittorrent/go-btfs/statestore/mock"
+	"github.com/ethereum/go-ethereum/common"
 
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type paymentCall struct {
@@ -24,19 +25,21 @@ type paymentCall struct {
 	contractId string
 }
 
-//TestAccountingCallSettlementTooSoon
+// TestAccountingCallSettlementTooSoon
 func TestAccountingCallSettlementTooSoon(t *testing.T) {
 	store := mock.NewStateStore()
 	defer store.Close()
 
+	addr := common.Address{}
+
 	acc, err := accounting.NewAccounting(store)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	paychan := make(chan paymentCall, 1)
 
-	acc.SetPayFunc(func(ctx context.Context, peer string, amount *big.Int, contractId string) {
+	acc.SetPayFunc(func(ctx context.Context, peer string, amount *big.Int, contractId string, addr common.Address) {
 		paychan <- paymentCall{peer: peer, amount: amount, contractId: contractId}
 	})
 
@@ -56,15 +59,16 @@ func TestAccountingCallSettlementTooSoon(t *testing.T) {
 		t.Fatal("payment not sent")
 	}
 
-	acc.NotifyPaymentSent(peer1Addr, big.NewInt(int64(requestPriceTmp)), errors.New("error"))
-	return
+	acc.NotifyPaymentSent(peer1Addr, big.NewInt(int64(requestPriceTmp)), errors.New("error"), addr)
 }
 
 // NotifyPaymentReceived
 func TestAccountingNotifyPaymentReceived(t *testing.T) {
 	store := mock.NewStateStore()
 	defer store.Close()
 
+	addr := common.Address{}
+
 	acc, err := accounting.NewAccounting(store)
 	if err != nil {
 		t.Fatal(err)
@@ -74,10 +78,8 @@ func TestAccountingNotifyPaymentReceived(t *testing.T) {
 
 	var amoutTmp uint64 = 5000
 
-	err = acc.NotifyPaymentReceived(peer1Addr, new(big.Int).SetUint64(amoutTmp))
+	err = acc.NotifyPaymentReceived(peer1Addr, new(big.Int).SetUint64(amoutTmp), addr)
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	return
 }

blocks/blockstoreutil/remove.go

@@ -6,9 +6,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/TRON-US/go-btfs-pinner"
 	cid "github.com/ipfs/go-cid"
 	bs "github.com/ipfs/go-ipfs-blockstore"
+	pin "github.com/ipfs/go-ipfs-pinner"
+	ipld "github.com/ipfs/go-ipld-format"
 )
 
 // RemovedBlock is used to represent the result of removing a block.
@@ -40,25 +41,25 @@ func RmBlocks(ctx context.Context, blocks bs.GCBlockstore, pins pin.Pinner, cids
 	go func() {
 		defer close(out)
 
-		unlocker := blocks.GCLock()
-		defer unlocker.Unlock()
+		unlocker := blocks.GCLock(ctx)
+		defer unlocker.Unlock(ctx)
 
 		stillOkay := FilterPinned(ctx, pins, out, cids)
 
 		for _, c := range stillOkay {
 			// Kept for backwards compatibility. We may want to
 			// remove this sometime in the future.
-			has, err := blocks.Has(c)
+			has, err := blocks.Has(ctx, c)
 			if err != nil {
 				out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
 				continue
 			}
 			if !has && !opts.Force {
-				out <- &RemovedBlock{Hash: c.String(), Error: bs.ErrNotFound.Error()}
+				out <- &RemovedBlock{Hash: c.String(), Error: ipld.ErrNotFound{Cid: c}.Error()}
 				continue
 			}
 
-			err = blocks.DeleteBlock(c)
+			err = blocks.DeleteBlock(ctx, c)
 			if err != nil {
 				out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
 			} else if !opts.Quiet {

cmd/btfs/daemon.go

@@ -83,6 +83,7 @@ const (
 	routingOptionDHTKwd       = "dht"
 	routingOptionDHTServerKwd = "dhtserver"
 	routingOptionNoneKwd      = "none"
+	routingOptionCustomKwd    = "custom"
 	routingOptionDefaultKwd   = "default"
 	unencryptTransportKwd     = "disable-transport-encryption"
 	unrestrictedApiAccessKwd  = "unrestricted-api"
@@ -579,12 +580,7 @@ If the user need to start multiple nodes on the same machine, the configuration
 
 	routingOption, _ := req.Options[routingOptionKwd].(string)
 	if routingOption == routingOptionDefaultKwd {
-		cfg, err := repo.Config()
-		if err != nil {
-			return err
-		}
-
-		routingOption = cfg.Routing.Type
+		routingOption = cfg.Routing.Type.String()
 		if routingOption == "" {
 			routingOption = routingOptionDHTKwd
 		}
@@ -600,6 +596,14 @@ If the user need to start multiple nodes on the same machine, the configuration
 		ncfg.Routing = libp2p.DHTServerOption
 	case routingOptionNoneKwd:
 		ncfg.Routing = libp2p.NilRouterOption
+	case routingOptionCustomKwd:
+		ncfg.Routing = libp2p.ConstructDelegatedRouting(
+			cfg.Routing.Routers,
+			cfg.Routing.Methods,
+			cfg.Identity.PeerID,
+			cfg.Addresses.Swarm,
+			cfg.Identity.PrivKey,
+		)
 	default:
 		return fmt.Errorf("unrecognized routing option: %s", routingOption)
 	}

cmd/btfs/dnsresolve_test.go

@@ -16,24 +16,26 @@ var (
 	testAddr, _ = ma.NewMultiaddr("/dns4/example.com/tcp/5001")
 )
 
-func makeResolver(n uint8) *madns.Resolver {
+func makeResolver(t *testing.T, n uint8) *madns.Resolver {
 	results := make([]net.IPAddr, n)
 	for i := uint8(0); i < n; i++ {
 		results[i] = net.IPAddr{IP: net.ParseIP(fmt.Sprintf("192.0.2.%d", i))}
 	}
 
-	backend := &madns.MockBackend{
+	backend := &madns.MockResolver{
 		IP: map[string][]net.IPAddr{
 			"example.com": results,
 		}}
 
-	return &madns.Resolver{
-		Backend: backend,
+	resolver, err := madns.NewResolver(madns.WithDefaultResolver(backend))
+	if err != nil {
+		t.Fatal(err)
 	}
+	return resolver
 }
 
 func TestApiEndpointResolveDNSOneResult(t *testing.T) {
-	dnsResolver = makeResolver(1)
+	dnsResolver = makeResolver(t, 1)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if err != nil {
@@ -46,7 +48,7 @@ func TestApiEndpointResolveDNSOneResult(t *testing.T) {
 }
 
 func TestApiEndpointResolveDNSMultipleResults(t *testing.T) {
-	dnsResolver = makeResolver(4)
+	dnsResolver = makeResolver(t, 4)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if err != nil {
@@ -59,7 +61,7 @@ func TestApiEndpointResolveDNSMultipleResults(t *testing.T) {
 }
 
 func TestApiEndpointResolveDNSNoResults(t *testing.T) {
-	dnsResolver = makeResolver(0)
+	dnsResolver = makeResolver(t, 0)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if addr != nil || err == nil {

cmd/seccat/seccat.go

@@ -2,8 +2,9 @@
 // This means the channel is encrypted (and MACed).
 // It is meant to exercise the spipe package.
 // Usage:
-//    seccat [<local address>] <remote address>
-//    seccat -l <local address>
+//
+//	seccat [<local address>] <remote address>
+//	seccat -l <local address>
 //
 // Address format is: [host]:port
 package main
@@ -19,11 +20,12 @@ import (
 	"syscall"
 
 	logging "github.com/ipfs/go-log"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	pstore "github.com/libp2p/go-libp2p-core/peerstore"
-	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
-	secio "github.com/libp2p/go-libp2p-secio"
+	ci "github.com/libp2p/go-libp2p/core/crypto"
+	peer "github.com/libp2p/go-libp2p/core/peer"
+	pstore "github.com/libp2p/go-libp2p/core/peerstore"
+	"github.com/libp2p/go-libp2p/core/protocol"
+	pstoremem "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
+	secio "github.com/libp2p/go-libp2p/p2p/security/noise"
 )
 
 var verbose = false
@@ -127,7 +129,10 @@ func setupPeer(a args) (peer.ID, pstore.Peerstore, error) {
 		return "", nil, err
 	}
 
-	ps := pstoremem.NewPeerstore()
+	ps, err := pstoremem.NewPeerstore()
+	if err != nil {
+		return "", nil, err
+	}
 	err = ps.AddPrivKey(p, sk)
 	if err != nil {
 		return "", nil, err
@@ -158,15 +163,15 @@ func connect(args args) error {
 	}
 
 	// log everything that goes through conn
-	rwc := &logConn{n: "conn", Conn: conn}
+	// rwc := &logConn{n: "conn", Conn: conn}
 
 	// OK, let's setup the channel.
 	sk := ps.PrivKey(p)
-	sg, err := secio.New(sk)
+	sg, err := secio.New(protocol.ID(secio.ID), sk, nil)
 	if err != nil {
 		return err
 	}
-	sconn, err := sg.SecureInbound(context.TODO(), rwc)
+	sconn, err := sg.SecureInbound(context.TODO(), conn, p)
 	if err != nil {
 		return err
 	}

commands/context.go

@@ -13,7 +13,7 @@ import (
 	config "github.com/TRON-US/go-btfs-config"
 	coreiface "github.com/TRON-US/interface-go-btfs-core"
 	options "github.com/TRON-US/interface-go-btfs-core/options"
-	"github.com/bittorrent/go-btfs-cmds"
+	cmds "github.com/bittorrent/go-btfs-cmds"
 	logging "github.com/ipfs/go-log"
 )
 

core/bootstrap/bootstrap.go

@@ -13,11 +13,11 @@ import (
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
 	periodicproc "github.com/jbenet/goprocess/periodic"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/peerstore"
-	"github.com/libp2p/go-libp2p-core/routing"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/peerstore"
+	"github.com/libp2p/go-libp2p/core/routing"
 )
 
 var log = logging.Logger("bootstrap")

core/bootstrap/bootstrap_test.go

@@ -3,8 +3,8 @@ package bootstrap
 import (
 	"testing"
 
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/test"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/test"
 )
 
 func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {