fix: mannually undo import github.com/TRON-US/lib; build green

soitun · Jun 8, 2019 · f5d75e2 · f5d75e2
1 parent e91a84f
commit f5d75e2
Show file tree

Hide file tree

Showing 114 changed files with 219 additions and 228 deletions.
diff --git a/assets/assets.go b/assets/assets.go
@@ -13,8 +13,8 @@ import (
 
  cid "github.com/ipfs/go-cid"
  files "github.com/ipfs/go-ipfs-files"
- iface "github.com/TRON-US/interface-go-btfs-core"
- options "github.com/TRON-US/interface-go-btfs-core/options"
+ iface "github.com/ipfs/interface-go-ipfs-core"
+ options "github.com/ipfs/interface-go-ipfs-core/options"
 
  // this import keeps gx from thinking the dep isn't used
  _ "github.com/ipfs/dir-index-html"

diff --git a/cmd/btfs/daemon.go b/cmd/btfs/daemon.go
@@ -28,7 +28,7 @@ import (
 
  "github.com/hashicorp/go-multierror"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  util "github.com/ipfs/go-ipfs-util"
  mprome "github.com/ipfs/go-metrics-prometheus"
  goprocess "github.com/jbenet/goprocess"

diff --git a/cmd/btfs/init.go b/cmd/btfs/init.go
@@ -17,8 +17,8 @@ import (
  fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
- config "github.com/TRON-US/go-btfs-config"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ config "github.com/ipfs/go-ipfs-config"
  files "github.com/ipfs/go-ipfs-files"
 )
 

diff --git a/cmd/btfs/ipfs.go b/cmd/btfs/ipfs.go
@@ -5,7 +5,7 @@ import (
 
  commands "github.com/TRON-US/go-btfs/core/commands"
 
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 // This is the CLI root, used for executing commands accessible to CLI clients.

diff --git a/cmd/btfs/main.go b/cmd/btfs/main.go
@@ -22,10 +22,10 @@ import (
  fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
 
  osh "github.com/Kubuxu/go-os-helper"
- cmds "github.com/TRON-US/go-btfs-cmds"
- "github.com/TRON-US/go-btfs-cmds/cli"
- "github.com/TRON-US/go-btfs-cmds/http"
- config "github.com/TRON-US/go-btfs-config"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ "github.com/ipfs/go-ipfs-cmds/cli"
+ "github.com/ipfs/go-ipfs-cmds/http"
+ config "github.com/ipfs/go-ipfs-config"
  u "github.com/ipfs/go-ipfs-util"
  logging "github.com/ipfs/go-log"
  loggables "github.com/libp2p/go-libp2p-loggables"

diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go
@@ -16,7 +16,7 @@ import (
  fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
 
  fsnotify "github.com/fsnotify/fsnotify"
- config "github.com/TRON-US/go-btfs-config"
+ config "github.com/ipfs/go-ipfs-config"
  files "github.com/ipfs/go-ipfs-files"
  process "github.com/jbenet/goprocess"
  homedir "github.com/mitchellh/go-homedir"

diff --git a/commands/context.go b/commands/context.go
@@ -10,11 +10,11 @@ import (
  coreapi "github.com/TRON-US/go-btfs/core/coreapi"
  loader "github.com/TRON-US/go-btfs/plugin/loader"
 
- "github.com/TRON-US/go-btfs-cmds"
- config "github.com/TRON-US/go-btfs-config"
+ "github.com/ipfs/go-ipfs-cmds"
+ config "github.com/ipfs/go-ipfs-config"
  logging "github.com/ipfs/go-log"
- coreiface "github.com/TRON-US/interface-go-btfs-core"
- options "github.com/TRON-US/interface-go-btfs-core/options"
+ coreiface "github.com/ipfs/interface-go-ipfs-core"
+ options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var log = logging.Logger("command")

diff --git a/core/bootstrap.go b/core/bootstrap.go
@@ -12,7 +12,7 @@ import (
  math2 "github.com/TRON-US/go-btfs/thirdparty/math2"
  lgbl "github.com/libp2p/go-libp2p-loggables"
 
- config "github.com/TRON-US/go-btfs-config"
+ config "github.com/ipfs/go-ipfs-config"
  goprocess "github.com/jbenet/goprocess"
  procctx "github.com/jbenet/goprocess/context"
  periodicproc "github.com/jbenet/goprocess/periodic"

diff --git a/core/bootstrap_test.go b/core/bootstrap_test.go
@@ -4,7 +4,7 @@ import (
  "fmt"
  "testing"
 
- config "github.com/TRON-US/go-btfs-config"
+ config "github.com/ipfs/go-ipfs-config"
  pstore "github.com/libp2p/go-libp2p-peerstore"
  testutil "github.com/libp2p/go-testutil"
 )

diff --git a/core/builder.go b/core/builder.go
@@ -22,13 +22,13 @@ import (
  retry "github.com/ipfs/go-datastore/retrystore"
  dsync "github.com/ipfs/go-datastore/sync"
  bstore "github.com/ipfs/go-ipfs-blockstore"
- cfg "github.com/TRON-US/go-btfs-config"
+ cfg "github.com/ipfs/go-ipfs-config"
  offline "github.com/ipfs/go-ipfs-exchange-offline"
  offroute "github.com/ipfs/go-ipfs-routing/offline"
  ipns "github.com/ipfs/go-ipns"
  dag "github.com/ipfs/go-merkledag"
  metrics "github.com/ipfs/go-metrics-interface"
- resolver "github.com/TRON-US/go-path/resolver"
+ resolver "github.com/ipfs/go-path/resolver"
  uio "github.com/ipfs/go-unixfs/io"
  goprocessctx "github.com/jbenet/goprocess/context"
  libp2p "github.com/libp2p/go-libp2p"

diff --git a/core/commands/active.go b/core/commands/active.go
@@ -10,7 +10,7 @@ import (
  oldcmds "github.com/TRON-US/go-btfs/commands"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 const (

diff --git a/core/commands/add.go b/core/commands/add.go
@@ -11,10 +11,10 @@ import (
  "github.com/TRON-US/go-btfs/core/commands/cmdenv"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  "github.com/ipfs/go-ipfs-files"
- coreiface "github.com/TRON-US/interface-go-btfs-core"
- "github.com/TRON-US/interface-go-btfs-core/options"
+ coreiface "github.com/ipfs/interface-go-ipfs-core"
+ "github.com/ipfs/interface-go-ipfs-core/options"
  mh "github.com/multiformats/go-multihash"
  pb "gopkg.in/cheggaaa/pb.v1"
 )

diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go
@@ -12,7 +12,7 @@ import (
  decision "github.com/ipfs/go-bitswap/decision"
  cidutil "github.com/ipfs/go-cidutil"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  peer "github.com/libp2p/go-libp2p-peer"
 )
 

diff --git a/core/commands/block.go b/core/commands/block.go
@@ -10,9 +10,9 @@ import (
  cmdenv "github.com/TRON-US/go-btfs/core/commands/cmdenv"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
- coreiface "github.com/TRON-US/interface-go-btfs-core"
- options "github.com/TRON-US/interface-go-btfs-core/options"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ coreiface "github.com/ipfs/interface-go-ipfs-core"
+ options "github.com/ipfs/interface-go-ipfs-core/options"
  mh "github.com/multiformats/go-multihash"
 )
 

diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go
@@ -10,8 +10,8 @@ import (
  fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
- config "github.com/TRON-US/go-btfs-config"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ config "github.com/ipfs/go-ipfs-config"
 )
 
 type BootstrapOutput struct {

diff --git a/core/commands/cat.go b/core/commands/cat.go
@@ -9,9 +9,9 @@ import (
  "github.com/TRON-US/go-btfs/core/commands/cmdenv"
 
  "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  "github.com/ipfs/go-ipfs-files"
- "github.com/TRON-US/interface-go-btfs-core"
+ "github.com/ipfs/interface-go-ipfs-core"
 )
 
 const (

diff --git a/core/commands/cid.go b/core/commands/cid.go
@@ -10,7 +10,7 @@ import (
  cid "github.com/ipfs/go-cid"
  cidutil "github.com/ipfs/go-cidutil"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  verifcid "github.com/ipfs/go-verifcid"
  mbase "github.com/multiformats/go-multibase"
  mhash "github.com/multiformats/go-multihash"

diff --git a/core/commands/cmdenv/cidbase.go b/core/commands/cmdenv/cidbase.go
@@ -7,7 +7,7 @@ import (
  cid "github.com/ipfs/go-cid"
  cidenc "github.com/ipfs/go-cidutil/cidenc"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  mbase "github.com/multiformats/go-multibase"
 )
 

diff --git a/core/commands/cmdenv/env.go b/core/commands/cmdenv/env.go
@@ -7,11 +7,11 @@ import (
  "github.com/TRON-US/go-btfs/commands"
  "github.com/TRON-US/go-btfs/core"
 
- cmds "github.com/TRON-US/go-btfs-cmds"
- config "github.com/TRON-US/go-btfs-config"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ config "github.com/ipfs/go-ipfs-config"
  logging "github.com/ipfs/go-log"
- coreiface "github.com/TRON-US/interface-go-btfs-core"
- options "github.com/TRON-US/interface-go-btfs-core/options"
+ coreiface "github.com/ipfs/interface-go-ipfs-core"
+ options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var log = logging.Logger("core/commands/cmdenv")

diff --git a/core/commands/commands.go b/core/commands/commands.go
@@ -13,7 +13,7 @@ import (
  "strings"
 
  "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 type commandEncoder struct {

diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go
@@ -4,7 +4,7 @@ import (
  "strings"
  "testing"
 
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) {

diff --git a/core/commands/config.go b/core/commands/config.go
@@ -16,8 +16,8 @@ import (
 
  "github.com/elgris/jsondiff"
  "github.com/ipfs/go-ipfs-cmdkit"
- "github.com/TRON-US/go-btfs-cmds"
- "github.com/TRON-US/go-btfs-config"
+ "github.com/ipfs/go-ipfs-cmds"
+ "github.com/ipfs/go-ipfs-config"
 )
 
 // ConfigUpdateOutput is config profile apply command's output

diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go
@@ -12,11 +12,11 @@ import (
  cid "github.com/ipfs/go-cid"
  cidenc "github.com/ipfs/go-cidutil/cidenc"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  files "github.com/ipfs/go-ipfs-files"
  ipld "github.com/ipfs/go-ipld-format"
- path "github.com/TRON-US/go-path"
- iface "github.com/TRON-US/interface-go-btfs-core"
+ path "github.com/ipfs/go-path"
+ iface "github.com/ipfs/interface-go-ipfs-core"
  mh "github.com/multiformats/go-multihash"
 )
 

diff --git a/core/commands/dht.go b/core/commands/dht.go
@@ -11,10 +11,10 @@ import (
 
  cid "github.com/ipfs/go-cid"
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  ipld "github.com/ipfs/go-ipld-format"
  dag "github.com/ipfs/go-merkledag"
- path "github.com/TRON-US/go-path"
+ path "github.com/ipfs/go-path"
  peer "github.com/libp2p/go-libp2p-peer"
  pstore "github.com/libp2p/go-libp2p-peerstore"
  routing "github.com/libp2p/go-libp2p-routing"

diff --git a/core/commands/diag.go b/core/commands/diag.go
@@ -2,7 +2,7 @@ package commands
 
 import (
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 var DiagCmd = &cmds.Command{

diff --git a/core/commands/dns.go b/core/commands/dns.go
@@ -6,10 +6,10 @@ import (
 
  ncmd "github.com/TRON-US/go-btfs/core/commands/name"
  namesys "github.com/TRON-US/go-btfs/namesys"
- nsopts "github.com/TRON-US/interface-go-btfs-core/options/namesys"
+ nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 const (

diff --git a/core/commands/external.go b/core/commands/external.go
@@ -9,7 +9,7 @@ import (
  "strings"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 func ExternalBinary() *cmds.Command {

diff --git a/core/commands/files.go b/core/commands/files.go
@@ -18,14 +18,14 @@ import (
  cid "github.com/ipfs/go-cid"
  cidenc "github.com/ipfs/go-cidutil/cidenc"
  "github.com/ipfs/go-ipfs-cmdkit"
- "github.com/TRON-US/go-btfs-cmds"
+ "github.com/ipfs/go-ipfs-cmds"
  "github.com/ipfs/go-ipfs-exchange-offline"
  ipld "github.com/ipfs/go-ipld-format"
  logging "github.com/ipfs/go-log"
  dag "github.com/ipfs/go-merkledag"
- "github.com/TRON-US/go-mfs"
+ "github.com/ipfs/go-mfs"
  ft "github.com/ipfs/go-unixfs"
- "github.com/TRON-US/interface-go-btfs-core"
+ "github.com/ipfs/interface-go-ipfs-core"
  mh "github.com/multiformats/go-multihash"
 )
 

diff --git a/core/commands/filestore.go b/core/commands/filestore.go
@@ -12,7 +12,7 @@ import (
 
  cid "github.com/ipfs/go-cid"
  "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 var FileStoreCmd = &cmds.Command{

diff --git a/core/commands/get.go b/core/commands/get.go
@@ -15,9 +15,9 @@ import (
  "github.com/TRON-US/go-btfs/core/commands/e"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  files "github.com/ipfs/go-ipfs-files"
- iface "github.com/TRON-US/interface-go-btfs-core"
+ iface "github.com/ipfs/interface-go-ipfs-core"
  "github.com/whyrusleeping/tar-utils"
  "gopkg.in/cheggaaa/pb.v1"
 )

diff --git a/core/commands/get_test.go b/core/commands/get_test.go
@@ -6,7 +6,7 @@ import (
  "testing"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 func TestGetOutputPath(t *testing.T) {

diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go
@@ -4,7 +4,7 @@ import (
  "strings"
  "testing"
 
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) {

diff --git a/core/commands/id.go b/core/commands/id.go
@@ -12,7 +12,7 @@ import (
  cmdenv "github.com/TRON-US/go-btfs/core/commands/cmdenv"
 
  "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  ic "github.com/libp2p/go-libp2p-crypto"
  kb "github.com/libp2p/go-libp2p-kbucket"
  "github.com/libp2p/go-libp2p-peer"

diff --git a/core/commands/keystore.go b/core/commands/keystore.go
@@ -8,8 +8,8 @@ import (
  cmdenv "github.com/TRON-US/go-btfs/core/commands/cmdenv"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
- options "github.com/TRON-US/interface-go-btfs-core/options"
+ cmds "github.com/ipfs/go-ipfs-cmds"
+ options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var KeyCmd = &cmds.Command{

diff --git a/core/commands/log.go b/core/commands/log.go
@@ -5,7 +5,7 @@ import (
  "io"
 
  cmdkit "github.com/ipfs/go-ipfs-cmdkit"
- cmds "github.com/TRON-US/go-btfs-cmds"
+ cmds "github.com/ipfs/go-ipfs-cmds"
  logging "github.com/ipfs/go-log"
  lwriter "github.com/ipfs/go-log/writer"
 )