From bd9576fa57a28a1eda14830ffd5bd7a9b18e83e4 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 20 Nov 2017 15:11:10 +0100 Subject: [PATCH 01/55] start adopting cmds3.0 - lots of errors! - move go-ipfs-cmds/legacy to go-ipfs/commands/legacy - update cmds,cmdkit; go test ./... ok License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 112 ++++++--------- cmd/ipfs/init.go | 2 +- cmd/ipfs/ipfs.go | 13 +- cmd/ipfs/main.go | 137 ++++++++---------- cmd/ipfs/main_test.go | 2 +- cmd/ipfswatch/main.go | 1 + commands/command.go | 10 +- commands/command_test.go | 5 +- commands/legacy/command.go | 70 ++++++++++ commands/legacy/legacy.go | 81 +++++++++++ commands/legacy/legacy_test.go | 214 +++++++++++++++++++++++++++++ commands/legacy/request.go | 194 ++++++++++++++++++++++++++ commands/legacy/response.go | 205 +++++++++++++++++++++++++++ commands/legacy/responseemitter.go | 55 ++++++++ commands/request.go | 15 +- commands/response.go | 5 +- commands/response_test.go | 5 +- core/commands/active.go | 2 +- core/commands/add.go | 93 ++++++------- core/commands/bitswap.go | 22 +-- core/commands/block.go | 53 +++---- core/commands/bootstrap.go | 2 +- core/commands/cat.go | 27 ++-- core/commands/commands.go | 55 ++------ core/commands/config.go | 2 +- core/commands/dag/dag.go | 4 +- core/commands/dht.go | 2 +- core/commands/diag.go | 2 +- core/commands/dns.go | 2 +- core/commands/env.go | 27 ++++ core/commands/external.go | 2 +- core/commands/files/files.go | 2 +- core/commands/filestore.go | 35 ++--- core/commands/get.go | 42 +++--- core/commands/get_test.go | 17 ++- core/commands/helptext_test.go | 2 +- core/commands/id.go | 3 +- core/commands/ipns.go | 2 +- core/commands/keystore.go | 2 +- core/commands/log.go | 2 +- core/commands/ls.go | 2 +- core/commands/mount_nofuse.go | 2 +- core/commands/mount_unix.go | 2 +- core/commands/mount_windows.go | 2 +- core/commands/name.go | 2 +- core/commands/object/diff.go | 2 +- core/commands/object/object.go | 2 +- core/commands/object/patch.go | 2 +- core/commands/p2p.go | 2 +- core/commands/pin.go | 3 +- core/commands/ping.go | 2 +- core/commands/publish.go | 2 +- core/commands/pubsub.go | 42 +++--- core/commands/refs.go | 2 +- core/commands/repo.go | 30 ++-- core/commands/resolve.go | 2 +- core/commands/root.go | 90 ++++++------ core/commands/shutdown.go | 2 +- core/commands/stat.go | 43 ++---- core/commands/swarm.go | 2 +- core/commands/sysdiag.go | 2 +- core/commands/tar.go | 2 +- core/commands/unixfs/ls.go | 2 +- core/commands/unixfs/unixfs.go | 2 +- core/commands/version.go | 2 +- core/corehttp/commands.go | 17 ++- core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 4 +- importer/helpers/dagbuilder.go | 2 +- importer/importer.go | 2 +- package.json | 8 +- 71 files changed, 1281 insertions(+), 530 deletions(-) create mode 100644 commands/legacy/command.go create mode 100644 commands/legacy/legacy.go create mode 100644 commands/legacy/legacy_test.go create mode 100644 commands/legacy/request.go create mode 100644 commands/legacy/response.go create mode 100644 commands/legacy/responseemitter.go create mode 100644 core/commands/env.go diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 042a15132..6ee5aa4e2 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -13,17 +13,17 @@ import ( utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util" "github.com/ipfs/go-ipfs/core" - commands "github.com/ipfs/go-ipfs/core/commands" + oldcmds "github.com/ipfs/go-ipfs/core/commands" corehttp "github.com/ipfs/go-ipfs/core/corehttp" corerepo "github.com/ipfs/go-ipfs/core/corerepo" nodeMount "github.com/ipfs/go-ipfs/fuse/node" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" @@ -181,9 +181,8 @@ func defaultMux(path string) corehttp.ServeOption { } } -func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { +func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { // Inject metrics before we do anything - err := mprome.Inject() if err != nil { log.Errorf("Injecting prometheus handler for metrics failed with message: %s\n", err.Error()) @@ -192,22 +191,23 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { // let the user know we're going. fmt.Printf("Initializing daemon...\n") - if managed, _, _ := req.Option(adjustFDLimitKwd).Bool(); managed { + managefd, _ := req.Options[adjustFDLimitKwd].(bool) + if managefd { if err := utilmain.ManageFdLimit(); err != nil { log.Errorf("setting file descriptor limit: %s", err) } } - ctx := req.InvocContext() + ctx := env.(*oldcmds.Context) go func() { - <-req.Context().Done() + <-req.Context.Done() fmt.Println("Received interrupt signal, shutting down...") fmt.Println("(Hit ctrl-c again to force-shutdown the daemon.)") }() // check transport encryption flag. - unencrypted, _, _ := req.Option(unencryptTransportKwd).Bool() + unencrypted, _ := req.Options[unencryptTransportKwd].(bool) if unencrypted { log.Warningf(`Running with --%s: All connections are UNENCRYPTED. You will not be able to connect to regular encrypted networks.`, unencryptTransportKwd) @@ -216,11 +216,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { // first, whether user has provided the initialization flag. we may be // running in an uninitialized state. - initialize, _, err := req.Option(initOptionKwd).Bool() - if err != nil { - re.SetError(err, cmdkit.ErrNormal) - return - } + initialize, _ := req.Options[initOptionKwd].(bool) if initialize { @@ -242,7 +238,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { re.SetError(err, cmdkit.ErrNormal) return case fsrepo.ErrNeedMigration: - domigrate, found, _ := req.Option(migrateKwd).Bool() + domigrate, found := req.Options[migrateKwd].(bool) fmt.Println("Found outdated fs-repo, migrations need to be run.") if !found { @@ -281,10 +277,10 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { return } - offline, _, _ := req.Option(offlineKwd).Bool() - pubsub, _, _ := req.Option(enableFloodSubKwd).Bool() - ipnsps, _, _ := req.Option(enableIPNSPubSubKwd).Bool() - mplex, _, _ := req.Option(enableMultiplexKwd).Bool() + offline, _ := req.Options[offlineKwd].(bool) + ipnsps, _, _ := req.Options[enableIPNSPubSubKwd].(bool) + pubsub, _ := req.Options[enableFloodSubKwd].(bool) + mplex, _ := req.Options[enableMultiplexKwd].(bool) // Start assembling node config ncfg := &core.BuildCfg{ @@ -299,11 +295,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { //TODO(Kubuxu): refactor Online vs Offline by adding Permanent vs Ephemeral } - routingOption, _, err := req.Option(routingOptionKwd).String() - if err != nil { - re.SetError(err, cmdkit.ErrNormal) - return - } + routingOption, _ := req.Options[routingOptionKwd].(string) switch routingOption { case routingOptionSupernodeKwd: re.SetError(errors.New("supernode routing was never fully implemented and has been removed"), cmdkit.ErrNormal) @@ -319,7 +311,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { return } - node, err := core.NewNode(req.Context(), ncfg) + node, err := core.NewNode(req.Context, ncfg) if err != nil { log.Error("error from node construction: ", err) re.SetError(err, cmdkit.ErrNormal) @@ -340,7 +332,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { node.Close() select { - case <-req.Context().Done(): + case <-req.Context.Done(): log.Info("Gracefully shut down daemon") default: } @@ -351,25 +343,21 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { } // construct api endpoint - every time - err, apiErrc := serveHTTPApi(req) + err, apiErrc := serveHTTPApi(req, ctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return } // construct fuse mountpoints - if the user provided the --mount flag - mount, _, err := req.Option(mountKwd).Bool() - if err != nil { - re.SetError(err, cmdkit.ErrNormal) - return - } + mount, _ := req.Options[mountKwd].(bool) if mount && offline { re.SetError(errors.New("mount is not currently supported in offline mode"), cmdkit.ErrClient) return } if mount { - if err := mountFuse(req); err != nil { + if err := mountFuse(req, ctx); err != nil { re.SetError(err, cmdkit.ErrNormal) return } @@ -386,7 +374,7 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { var gwErrc <-chan error if len(cfg.Addresses.Gateway) > 0 { var err error - err, gwErrc = serveHTTPGateway(req) + err, gwErrc = serveHTTPGateway(req, ctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -408,16 +396,13 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) { } // serveHTTPApi collects options, creates listener, prints status message and starts serving requests -func serveHTTPApi(req cmds.Request) (error, <-chan error) { - cfg, err := req.InvocContext().GetConfig() +func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) { + cfg, err := cctx.GetConfig() if err != nil { return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil } - apiAddr, _, err := req.Option(commands.ApiOption).String() - if err != nil { - return fmt.Errorf("serveHTTPApi: %s", err), nil - } + apiAddr, _ := req.Options[oldcmds.ApiOption].(string) if apiAddr == "" { apiAddr = cfg.Addresses.API } @@ -438,10 +423,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) { // because this would open up the api to scripting vulnerabilities. // only the webui objects are allowed. // if you know what you're doing, go ahead and pass --unrestricted-api. - unrestricted, _, err := req.Option(unrestrictedApiAccessKwd).Bool() - if err != nil { - return fmt.Errorf("serveHTTPApi: Option(%s) failed: %s", unrestrictedApiAccessKwd, err), nil - } + unrestricted, _ := req.Options[unrestrictedApiAccessKwd].(bool) gatewayOpt := corehttp.GatewayOption(false, corehttp.WebUIPaths...) if unrestricted { gatewayOpt = corehttp.GatewayOption(true, "/ipfs", "/ipns") @@ -449,7 +431,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) { var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), - corehttp.CommandsOption(*req.InvocContext()), + corehttp.CommandsOption(*cctx), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), @@ -463,7 +445,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) { opts = append(opts, corehttp.RedirectOption("", cfg.Gateway.RootRedirect)) } - node, err := req.InvocContext().ConstructNode() + node, err := cctx.ConstructNode() if err != nil { return fmt.Errorf("serveHTTPApi: ConstructNode() failed: %s", err), nil } @@ -512,8 +494,8 @@ func printSwarmAddrs(node *core.IpfsNode) { } // serveHTTPGateway collects options, creates listener, prints status message and starts serving requests -func serveHTTPGateway(req cmds.Request) (error, <-chan error) { - cfg, err := req.InvocContext().GetConfig() +func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) { + cfg, err := cctx.GetConfig() if err != nil { return fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err), nil } @@ -523,10 +505,7 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) { return fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err), nil } - writable, writableOptionFound, err := req.Option(writableKwd).Bool() - if err != nil { - return fmt.Errorf("serveHTTPGateway: req.Option(%s) failed: %s", writableKwd, err), nil - } + writable, writableOptionFound := req.Options[writableKwd].(bool) if !writableOptionFound { writable = cfg.Gateway.Writable } @@ -546,7 +525,7 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) { var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("gateway"), - corehttp.CommandsROOption(*req.InvocContext()), + corehttp.CommandsROOption(*cctx), corehttp.VersionOption(), corehttp.IPNSHostnameOption(), corehttp.GatewayOption(writable, "/ipfs", "/ipns"), @@ -556,7 +535,7 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) { opts = append(opts, corehttp.RedirectOption("", cfg.Gateway.RootRedirect)) } - node, err := req.InvocContext().ConstructNode() + node, err := cctx.ConstructNode() if err != nil { return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil } @@ -570,29 +549,23 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) { } //collects options and opens the fuse mountpoint -func mountFuse(req cmds.Request) error { - cfg, err := req.InvocContext().GetConfig() +func mountFuse(req *cmds.Request, cctx *oldcmds.Context) error { + cfg, err := cctx.GetConfig() if err != nil { return fmt.Errorf("mountFuse: GetConfig() failed: %s", err) } - fsdir, found, err := req.Option(ipfsMountKwd).String() - if err != nil { - return fmt.Errorf("mountFuse: req.Option(%s) failed: %s", ipfsMountKwd, err) - } + fsdir, found := req.Options[ipfsMountKwd].(string) if !found { fsdir = cfg.Mounts.IPFS } - nsdir, found, err := req.Option(ipnsMountKwd).String() - if err != nil { - return fmt.Errorf("mountFuse: req.Option(%s) failed: %s", ipnsMountKwd, err) - } + nsdir, found := req.Options[ipnsMountKwd].(string) if !found { nsdir = cfg.Mounts.IPNS } - node, err := req.InvocContext().ConstructNode() + node, err := cctx.ConstructNode() if err != nil { return fmt.Errorf("mountFuse: ConstructNode() failed: %s", err) } @@ -606,18 +579,15 @@ func mountFuse(req cmds.Request) error { return nil } -func maybeRunGC(req cmds.Request, node *core.IpfsNode) (error, <-chan error) { - enableGC, _, err := req.Option(enableGCKwd).Bool() - if err != nil { - return err, nil - } +func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (error, <-chan error) { + enableGC, _ := req.Options[enableGCKwd].(bool) if !enableGC { return nil, nil } errc := make(chan error) go func() { - errc <- corerepo.PeriodicGC(req.Context(), node) + errc <- corerepo.PeriodicGC(req.Context, node) close(errc) }() return nil, errc diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 20e15b27f..752de642b 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) const ( diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index ca45d3c3e..de94bb71b 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -3,10 +3,10 @@ package main import ( "fmt" - oldcmds "github.com/ipfs/go-ipfs/commands" commands "github.com/ipfs/go-ipfs/core/commands" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" + lgc "github.com/ipfs/go-ipfs/commands/legacy" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. @@ -24,7 +24,7 @@ var commandsClientCmd = commands.CommandsCmd(Root) // They can override subcommands in commands.Root by defining a subcommand with the same name. var localCommands = map[string]*cmds.Command{ "daemon": daemonCmd, - "init": cmds.NewCommand(initCmd), + "init": lgc.NewCommand(initCmd), "commands": commandsClientCmd, } var localMap = make(map[*cmds.Command]bool) @@ -33,14 +33,7 @@ func init() { // setting here instead of in literal to prevent initialization loop // (some commands make references to Root) Root.Subcommands = localCommands - Root.OldSubcommands = map[string]*oldcmds.Command{} - // copy all subcommands from commands.Root into this root (if they aren't already present) - for k, v := range commands.Root.OldSubcommands { - if _, found := Root.OldSubcommands[k]; !found { - Root.OldSubcommands[k] = v - } - } for k, v := range commands.Root.Subcommands { if _, found := Root.Subcommands[k]; !found { Root.Subcommands[k] = v diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index c8a41e9f2..726c675e0 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -18,6 +18,7 @@ import ( "syscall" "time" + oldcmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" coreCmds "github.com/ipfs/go-ipfs/core/commands" "github.com/ipfs/go-ipfs/plugin/loader" @@ -33,6 +34,10 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/cli" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/http" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" ) @@ -49,10 +54,9 @@ const ( ) type cmdInvocation struct { - path []string - cmd *cmds.Command - req cmds.Request + req *cmds.Request node *core.IpfsNode + ctx *oldcmds.Context } type exitErr int @@ -100,12 +104,17 @@ func mainRet() int { helpFunc = cli.LongHelp } - helpFunc("ipfs", Root, invoc.path, w) + var p []string + if invoc.req != nil { + p = invoc.req.Path + } + + helpFunc("ipfs", Root, p, w) } // this is a message to tell the user how to get the help text printMetaHelp := func(w io.Writer) { - cmdPath := strings.Join(invoc.path, " ") + cmdPath := strings.Join(invoc.req.Path, " ") fmt.Fprintf(w, "Use 'ipfs %s --help' for information about this command\n", cmdPath) } @@ -119,6 +128,9 @@ func mainRet() int { } } + intrh, ctx := invoc.SetupInterruptHandler(ctx) + defer intrh.Close() + // parse the commandline into a command invocation parseErr := invoc.Parse(ctx, os.Args[1:]) @@ -142,7 +154,7 @@ func mainRet() int { printErr(parseErr) // this was a user error, print help. - if invoc.cmd != nil { + if invoc.req != nil && invoc.req.Command != nil { // we need a newline space. fmt.Fprintf(os.Stderr, "\n") printHelp(false, os.Stderr) @@ -153,15 +165,12 @@ func mainRet() int { // here we handle the cases where // - commands with no Run func are invoked directly. // - the main command is invoked. - if invoc.cmd == nil || invoc.cmd.Run == nil { + if invoc.req == nil || invoc.req.Command == nil || invoc.req.Command.Run == nil { printHelp(false, os.Stdout) return 0 } // ok, finally, run the command invocation. - intrh, ctx := invoc.SetupInterruptHandler(ctx) - defer intrh.Close() - err = invoc.Run(ctx) if err != nil { if code, ok := err.(exitErr); ok { @@ -184,10 +193,7 @@ func mainRet() int { func (i *cmdInvocation) Run(ctx context.Context) error { // check if user wants to debug. option OR env var. - debug, _, err := i.req.Option("debug").Bool() - if err != nil { - return err - } + debug, _ := i.req.Options["debug"].(bool) if debug || os.Getenv("IPFS_LOGGING") == "debug" { u.Debug = true logging.SetDebugLogging() @@ -196,8 +202,7 @@ func (i *cmdInvocation) Run(ctx context.Context) error { u.Debug = true } - err = callCommand(ctx, i.req, Root, i.cmd) - return err + return callCommand(ctx, i.req, Root, i.ctx) } func (i *cmdInvocation) constructNodeFunc(ctx context.Context) func() (*core.IpfsNode, error) { @@ -206,12 +211,7 @@ func (i *cmdInvocation) constructNodeFunc(ctx context.Context) func() (*core.Ipf return nil, errors.New("constructing node without a request") } - cmdctx := i.req.InvocContext() - if cmdctx == nil { - return nil, errors.New("constructing node without a request context") - } - - r, err := fsrepo.Open(i.req.InvocContext().ConfigRoot) + r, err := fsrepo.Open(i.ctx.ConfigRoot) if err != nil { // repo is owned by the node return nil, err } @@ -219,7 +219,7 @@ func (i *cmdInvocation) constructNodeFunc(ctx context.Context) func() (*core.Ipf // ok everything is good. set it on the invocation (for ownership) // and return it. n, err = core.NewNode(ctx, &core.BuildCfg{ - Online: cmdctx.Online, + Online: i.ctx.Online, Repo: r, }) if err != nil { @@ -244,11 +244,17 @@ func (i *cmdInvocation) close() { func (i *cmdInvocation) Parse(ctx context.Context, args []string) error { var err error - i.req, i.cmd, i.path, err = cli.Parse(args, os.Stdin, Root) + i.req, err = cli.Parse(args, os.Stdin, Root) if err != nil { return err } + //TODO remove this + //fmt.Printf("%#v\n", i.req) + + // TODO(keks): pass this as arg to cli.Parse() + i.req.Context = ctx + repoPath, err := getRepoPath(i.req) if err != nil { return err @@ -256,20 +262,22 @@ func (i *cmdInvocation) Parse(ctx context.Context, args []string) error { log.Debugf("config path is %s", repoPath) // this sets up the function that will initialize the config lazily. - cmdctx := i.req.InvocContext() - cmdctx.ConfigRoot = repoPath - cmdctx.LoadConfig = loadConfig + if i.ctx == nil { + i.ctx = &oldcmds.Context{} + } + i.ctx.ConfigRoot = repoPath + i.ctx.LoadConfig = loadConfig // this sets up the function that will initialize the node // this is so that we can construct the node lazily. - cmdctx.ConstructNode = i.constructNodeFunc(ctx) + i.ctx.ConstructNode = i.constructNodeFunc(ctx) // if no encoding was specified by user, default to plaintext encoding // (if command doesn't support plaintext, use JSON instead) - if !i.req.Option("encoding").Found() { - if i.req.Command().Encoders != nil && i.req.Command().Encoders[cmds.Text] != nil { - i.req.SetOption("encoding", cmds.Text) + if enc := i.req.Options[cmds.EncShort]; enc == "" { + if i.req.Command.Encoders != nil && i.req.Command.Encoders[cmds.Text] != nil { + i.req.SetOption(cmds.EncShort, cmds.Text) } else { - i.req.SetOption("encoding", cmds.JSON) + i.req.SetOption(cmds.EncShort, cmds.JSON) } } @@ -277,18 +285,12 @@ func (i *cmdInvocation) Parse(ctx context.Context, args []string) error { } func (i *cmdInvocation) requestedHelp() (short bool, long bool, err error) { - longHelp, _, err := i.req.Option("help").Bool() - if err != nil { - return false, false, err - } - shortHelp, _, err := i.req.Option("h").Bool() - if err != nil { - return false, false, err - } + longHelp, _ := i.req.Options["help"].(bool) + shortHelp, _ := i.req.Options["h"].(bool) return longHelp, shortHelp, nil } -func callPreCommandHooks(ctx context.Context, details cmdDetails, req cmds.Request, root *cmds.Command) error { +func callPreCommandHooks(ctx context.Context, details cmdDetails, req *cmds.Request, root *cmds.Command) error { log.Event(ctx, "callPreCommandHooks", &details) log.Debug("calling pre-command hooks...") @@ -296,20 +298,16 @@ func callPreCommandHooks(ctx context.Context, details cmdDetails, req cmds.Reque return nil } -func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd *cmds.Command) error { - log.Info(config.EnvDir, " ", req.InvocContext().ConfigRoot) +func callCommand(ctx context.Context, req *cmds.Request, root *cmds.Command, cctx *oldcmds.Context) error { + log.Info(config.EnvDir, " ", cctx.ConfigRoot) + cmd := req.Command - err := req.SetRootContext(ctx) + details, err := commandDetails(req.Path, root) if err != nil { return err } - details, err := commandDetails(req.Path(), root) - if err != nil { - return err - } - - client, err := commandShouldRunOnDaemon(*details, req, root) + client, err := commandShouldRunOnDaemon(*details, req, root, cctx) if err != nil { return err } @@ -319,11 +317,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd return err } - encTypeStr, found, err := req.Option("encoding").String() - if !found || err != nil { - log.Error("error getting encoding - using JSON. reason: ", err) - encTypeStr = "json" - } + encTypeStr, _ := req.Options[cmds.EncShort].(string) encType := cmds.EncodingType(encTypeStr) var ( @@ -341,7 +335,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd } if cmd.PreRun != nil { - err = cmd.PreRun(req) + err = cmd.PreRun(req, cctx) if err != nil { return err } @@ -375,19 +369,14 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd } else { log.Debug("executing command locally") - pluginpath := filepath.Join(req.InvocContext().ConfigRoot, "plugins") + pluginpath := filepath.Join(cctx.ConfigRoot, "plugins") if _, err := loader.LoadPlugins(pluginpath); err != nil { return err } - err := req.SetRootContext(ctx) - if err != nil { - return err - } - // Okay!!!!! NOW we can call the command. go func() { - err := root.Call(req, re) + err := root.Call(req, re, cctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) } @@ -428,8 +417,8 @@ func commandDetails(path []string, root *cmds.Command) (*cmdDetails, error) { // It returns a client if the command should be executed on a daemon and nil if // it should be executed on a client. It returns an error if the command must // NOT be executed on either. -func commandShouldRunOnDaemon(details cmdDetails, req cmds.Request, root *cmds.Command) (http.Client, error) { - path := req.Path() +func commandShouldRunOnDaemon(details cmdDetails, req *cmds.Request, root *cmds.Command, cctx *oldcmds.Context) (http.Client, error) { + path := req.Path // root command. if len(path) < 1 { return nil, nil @@ -447,14 +436,11 @@ func commandShouldRunOnDaemon(details cmdDetails, req cmds.Request, root *cmds.C // to this point so that we dont check unnecessarily // did user specify an api to use for this command? - apiAddrStr, _, err := req.Option(coreCmds.ApiOption).String() - if err != nil { - return nil, err - } + apiAddrStr, _ := req.Options[coreCmds.ApiOption].(string) - client, err := getApiClient(req.InvocContext().ConfigRoot, apiAddrStr) + client, err := getApiClient(cctx.ConfigRoot, apiAddrStr) if err == repo.ErrApiNotRunning { - if apiAddrStr != "" && req.Command() != daemonCmd { + if apiAddrStr != "" && req.Command != daemonCmd { // if user SPECIFIED an api, and this cmd is not daemon // we MUST use it. so error out. return nil, err @@ -469,7 +455,7 @@ func commandShouldRunOnDaemon(details cmdDetails, req cmds.Request, root *cmds.C if details.cannotRunOnDaemon { // check if daemon locked. legacy error text, for now. log.Debugf("Command cannot run on daemon. Checking if daemon is locked") - if daemonLocked, _ := fsrepo.LockedByOtherProcess(req.InvocContext().ConfigRoot); daemonLocked { + if daemonLocked, _ := fsrepo.LockedByOtherProcess(cctx.ConfigRoot); daemonLocked { return nil, cmds.ClientError("ipfs daemon is running. please stop it to run this command") } return nil, nil @@ -493,11 +479,8 @@ func isClientError(err error) bool { return false } -func getRepoPath(req cmds.Request) (string, error) { - repoOpt, found, err := req.Option("config").String() - if err != nil { - return "", err - } +func getRepoPath(req *cmds.Request) (string, error) { + repoOpt, found := req.Options["config"].(string) if found && repoOpt != "" { return repoOpt, nil } diff --git a/cmd/ipfs/main_test.go b/cmd/ipfs/main_test.go index 3922fdbf1..4c8ab2d5a 100644 --- a/cmd/ipfs/main_test.go +++ b/cmd/ipfs/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) func TestIsCientErr(t *testing.T) { diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 5f5bf5cb0..092079d7f 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -9,6 +9,7 @@ import ( "path/filepath" "syscall" + commands "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" corehttp "github.com/ipfs/go-ipfs/core/corehttp" coreunix "github.com/ipfs/go-ipfs/core/coreunix" diff --git a/commands/command.go b/commands/command.go index 626900e95..3454d5bd2 100644 --- a/commands/command.go +++ b/commands/command.go @@ -15,8 +15,10 @@ import ( "reflect" "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var log = logging.Logger("command") @@ -283,9 +285,9 @@ func ClientError(msg string) error { // global options, added to every command var globalOptions = []cmdkit.Option{ - cmdkit.OptionEncodingType, - cmdkit.OptionStreamChannels, - cmdkit.OptionTimeout, + cmds.OptionEncodingType, + cmds.OptionStreamChannels, + cmds.OptionTimeout, } // the above array of Options, wrapped in a Command diff --git a/commands/command_test.go b/commands/command_test.go index d9d6aa1d8..634e871fb 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,7 +3,8 @@ package commands import ( "testing" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) func noop(req Request, res Response) { @@ -58,7 +59,7 @@ func TestOptionValidation(t *testing.T) { } req, _ = NewRequest(nil, nil, nil, nil, nil, opts) - req.SetOption(cmdkit.EncShort, "json") + req.SetOption(cmds.EncShort, "json") res = cmd.Call(req) if res.Error() != nil { t.Error("Should have passed") diff --git a/commands/legacy/command.go b/commands/legacy/command.go new file mode 100644 index 000000000..543872eda --- /dev/null +++ b/commands/legacy/command.go @@ -0,0 +1,70 @@ +package legacy + +import ( + "io" + + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + + oldcmds "github.com/ipfs/go-ipfs/commands" + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" +) + +var log = logging.Logger("cmds/lgc") + +// NewCommand returns a Command from an oldcmds.Command +func NewCommand(oldcmd *oldcmds.Command) *cmds.Command { + if oldcmd == nil { + return nil + } + var cmd *cmds.Command + + cmd = &cmds.Command{ + Options: oldcmd.Options, + Arguments: oldcmd.Arguments, + Helptext: oldcmd.Helptext, + External: oldcmd.External, + Type: oldcmd.Type, + + Subcommands: make(map[string]*cmds.Command), + } + + if oldcmd.Run != nil { + cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { + oldReq := &requestWrapper{req, OldContext(env)} + res := &fakeResponse{req: oldReq, re: re, wait: make(chan struct{})} + + errCh := make(chan error) + go res.Send(errCh) + oldcmd.Run(oldReq, res) + err := <-errCh + if err != nil { + log.Error(err) + } + } + } + + if oldcmd.PreRun != nil { + cmd.PreRun = func(req *cmds.Request, env interface{}) error { + oldReq := &requestWrapper{req, OldContext(env)} + return oldcmd.PreRun(oldReq) + } + } + + for name, sub := range oldcmd.Subcommands { + cmd.Subcommands[name] = NewCommand(sub) + } + + cmd.Encoders = make(cmds.EncoderMap) + + for encType, m := range oldcmd.Marshalers { + cmd.Encoders[cmds.EncodingType(encType)] = func(m oldcmds.Marshaler, encType oldcmds.EncodingType) func(req *cmds.Request) func(io.Writer) cmds.Encoder { + return func(req *cmds.Request) func(io.Writer) cmds.Encoder { + return func(w io.Writer) cmds.Encoder { + return NewMarshalerEncoder(req, m, w) + } + } + }(m, encType) + } + + return cmd +} diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go new file mode 100644 index 000000000..543809f54 --- /dev/null +++ b/commands/legacy/legacy.go @@ -0,0 +1,81 @@ +package legacy + +import ( + "io" + "runtime/debug" + + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + + oldcmds "github.com/ipfs/go-ipfs/commands" +) + +// MarshalerEncoder implements Encoder from a Marshaler +type MarshalerEncoder struct { + m oldcmds.Marshaler + w io.Writer + req *cmds.Request +} + +// NewMarshalerEncoder returns a new MarshalerEncoder +func NewMarshalerEncoder(req *cmds.Request, m oldcmds.Marshaler, w io.Writer) *MarshalerEncoder { + me := &MarshalerEncoder{ + m: m, + w: w, + req: req, + } + + return me +} + +// Encode encodes v onto the io.Writer w using Marshaler m, with both m and w passed in NewMarshalerEncoder +func (me *MarshalerEncoder) Encode(v interface{}) error { + re, res := cmds.NewChanResponsePair(me.req) + go re.Emit(v) + + r, err := me.m(&responseWrapper{Response: res}) + if err != nil { + return err + } + if r == nil { + // behave like empty reader + return nil + } + + _, err = io.Copy(me.w, r) + return err +} + +func OldContext(env interface{}) *oldcmds.Context { + ctx, ok := env.(*oldcmds.Context) + if !ok { + log.Errorf("OldContext: env passed is not %T but %T\n%s", ctx, env, debug.Stack()) + } + + return ctx +} + +/* +// OldReqLog returns an oldcmds.ReqLog from a ReqLog +func OldReqLog(newrl *ReqLog) *oldcmds.ReqLog { + if newrl == nil { + return nil + } + + rl := &oldcmds.ReqLog{} + + for _, rle := range newrl.Requests { + oldrle := &oldcmds.ReqLogEntry{ + StartTime: rle.StartTime, + EndTime: rle.EndTime, + Active: rle.Active, + Command: rle.Command, + Options: rle.Options, + Args: rle.Args, + ID: rle.ID, + } + rl.AddEntry(oldrle) + } + + return rl +} +*/ diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go new file mode 100644 index 000000000..a91d5855b --- /dev/null +++ b/commands/legacy/legacy_test.go @@ -0,0 +1,214 @@ +package legacy + +import ( + "bytes" + "context" + "io" + "testing" + + oldcmds "github.com/ipfs/go-ipfs/commands" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" +) + +type WriteNopCloser struct { + io.Writer +} + +func (wc WriteNopCloser) Close() error { + return nil +} + +func TestNewCommand(t *testing.T) { + root := &cmds.Command{ + Subcommands: map[string]*cmds.Command{ + "test": NewCommand(&oldcmds.Command{ + Run: func(req oldcmds.Request, res oldcmds.Response) { + res.SetOutput("Test.") + }, + Marshalers: map[oldcmds.EncodingType]oldcmds.Marshaler{ + oldcmds.Text: func(res oldcmds.Response) (io.Reader, error) { + ch, ok := res.Output().(<-chan interface{}) + if !ok { + t.Fatalf("output is not <-chan interface{} but %T", ch) + } + + v := <-ch + str, ok := v.(string) + if !ok { + t.Fatalf("read value is not string but %T", v) + } + + buf := bytes.NewBuffer(nil) + _, err := io.WriteString(buf, str) + if err != nil { + t.Fatal(err) + } + + return buf, nil + }, + }, + Subcommands: map[string]*oldcmds.Command{ + "sub": &oldcmds.Command{ + Options: []cmdkit.Option{ + cmdkit.NewOption(cmdkit.String, "test", "t", "some random test flag"), + }, + }, + }, + }), + }, + } + + path := []string{"test"} + req, err := cmds.NewRequest(context.TODO(), path, nil, nil, nil, root) + if err != nil { + t.Fatal(err) + } + + buf := bytes.NewBuffer(nil) + + // test calling "test" command + testCmd := root.Subcommand("test") + enc := testCmd.Encoders[oldcmds.Text] + if enc == nil { + t.Fatal("got nil encoder") + } + + re := cmds.NewWriterResponseEmitter(WriteNopCloser{buf}, req, enc) + + var env oldcmds.Context + + err = root.Call(req, re, &env) + if err != nil { + t.Fatal(err) + } + + expected := "Test." + + if buf.String() != expected { + t.Fatalf("expected string %#v but got %#v", expected, buf.String()) + } + + // test getting subcommand + subCmd := testCmd.Subcommand("sub") + if subCmd == nil { + t.Fatal("got nil subcommand") + } + + if nOpts := len(subCmd.Options); nOpts != 1 { + t.Fatalf("subcommand has %v options, expected 1", nOpts) + } + + opt := subCmd.Options[0] + + if nNames := len(opt.Names()); nNames != 2 { + t.Fatalf("option has %v names, expected 2", nNames) + } + + names := opt.Names() + if names[0] != "test" { + t.Fatalf("option has name %q, expected %q", names[0], "test") + } + + if names[1] != "t" { + t.Fatalf("option has name %q, expected %q", names[1], "t") + } +} + +func TestPipePair(t *testing.T) { + cmd := &cmds.Command{Type: "string"} + + req, err := cmds.NewRequest(context.TODO(), nil, nil, nil, nil, cmd) + if err != nil { + t.Fatal(err) + } + + r, w := io.Pipe() + re := cmds.NewWriterResponseEmitter(w, req, cmds.Encoders[cmds.JSON]) + res := cmds.NewReaderResponse(r, cmds.JSON, req) + + wait := make(chan interface{}) + + expect := "abc" + go func() { + err := re.Emit(expect) + if err != nil { + t.Fatal(err) + } + + close(wait) + }() + + v, err := res.Next() + if err != nil { + t.Fatal(err) + } + str, ok := v.(*string) + if !ok { + t.Fatalf("expected type %T but got %T", expect, v) + } + if *str != expect { + t.Fatalf("expected value %#v but got %#v", expect, v) + } + + <-wait + +} + +func TestTeeEmitter(t *testing.T) { + req, err := cmds.NewRequest(nil, nil, nil, nil, nil, nil) + if err != nil { + t.Fatal(err) + } + + buf1 := bytes.NewBuffer(nil) + re1 := cmds.NewWriterResponseEmitter(WriteNopCloser{buf1}, req, cmds.Encoders[cmds.Text]) + + buf2 := bytes.NewBuffer(nil) + re2 := cmds.NewWriterResponseEmitter(WriteNopCloser{buf2}, req, cmds.Encoders[cmds.Text]) + + re := cmds.NewTeeEmitter(re1, re2) + + expect := "def" + err = re.Emit(expect) + if err != nil { + t.Fatal(err) + } + + if buf1.String() != expect { + t.Fatal("expected %#v, got %#v", expect, buf1.String()) + } + + if buf2.String() != expect { + t.Fatal("expected %#v, got %#v", expect, buf2.String()) + } +} + +/* +type teeErrorTestCase struct { + err1, err2 error + bothNil bool + errString string +} + +func TestTeeError(t *testing.T) { + tcs := []teeErrorTestCase{ + teeErrorTestCase{nil, nil, true, ""}, + teeErrorTestCase{fmt.Errorf("error!"), nil, false, "1: error!"}, + teeErrorTestCase{nil, fmt.Errorf("error!"), false, "2: error!"}, + teeErrorTestCase{fmt.Errorf("error!"), fmt.Errorf("error!"), false, `1: error! +2: error!`}, + } + + for i, tc := range tcs { + teeError := cmds.TeeError{tc.err1, tc.err2} + if teeError.BothNil() != tc.bothNil { + t.Fatalf("BothNil()/%d: expected %v but got %v", i, tc.bothNil, teeError.BothNil()) + } + + if teeError.Error() != tc.errString { + t.Fatalf("Error()/%d: expected %v but got %v", i, tc.errString, teeError.Error()) + } + } +} +*/ diff --git a/commands/legacy/request.go b/commands/legacy/request.go new file mode 100644 index 000000000..cc8377d27 --- /dev/null +++ b/commands/legacy/request.go @@ -0,0 +1,194 @@ +package legacy + +import ( + "context" + "fmt" + "io" + "os" + "reflect" + + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + + oldcmds "github.com/ipfs/go-ipfs/commands" +) + +// requestWrapper implements a oldcmds.Request from an Request +type requestWrapper struct { + req *cmds.Request + ctx *oldcmds.Context +} + +// InvocContext retuns the invocation context of the oldcmds.Request. +// It is faked using OldContext(). +func (r *requestWrapper) InvocContext() *oldcmds.Context { + return r.ctx +} + +// SetInvocContext sets the invocation context. First the context is converted +// to a Context using NewContext(). +func (r *requestWrapper) SetInvocContext(ctx oldcmds.Context) { + r.ctx = &ctx +} + +// Command is an empty stub. +func (r *requestWrapper) Command() *oldcmds.Command { return nil } + +func (r *requestWrapper) Arguments() []string { + return r.req.Arguments +} + +func (r *requestWrapper) Context() context.Context { + return r.req.Context +} + +func (r *requestWrapper) ConvertOptions() error { + return convertOptions(r.req) +} + +func (r *requestWrapper) Files() files.File { + return r.req.Files +} + +func (r *requestWrapper) Option(name string) *cmdkit.OptionValue { + var option cmdkit.Option + + for _, def := range r.req.Command.Options { + for _, optName := range def.Names() { + if name == optName { + option = def + break + } + } + } + if option == nil { + return nil + } + + // try all the possible names, break if we find a value + for _, n := range option.Names() { + val, found := r.req.Options[n] + if found { + return &cmdkit.OptionValue{val, found, option} + } + } + + return &cmdkit.OptionValue{option.Default(), false, option} +} + +func (r *requestWrapper) Options() cmdkit.OptMap { + return r.req.Options +} + +func (r *requestWrapper) Path() []string { + return r.req.Path +} + +func (r *requestWrapper) SetArguments(args []string) { + r.req.Arguments = args +} + +func (r *requestWrapper) SetFiles(f files.File) { + r.req.Files = f +} + +func (r *requestWrapper) SetOption(name string, v interface{}) { + r.req.SetOption(name, v) +} + +func (r *requestWrapper) SetOptions(om cmdkit.OptMap) error { + r.req.Options = om + return convertOptions(r.req) +} + +func (r *requestWrapper) SetRootContext(ctx context.Context) error { + r.req.Context = ctx + return nil +} + +func (r *requestWrapper) Stdin() io.Reader { + return os.Stdin +} + +func (r *requestWrapper) StringArguments() []string { + return r.req.Arguments +} + +func (r *requestWrapper) Values() map[string]interface{} { + return nil +} + +func (r *requestWrapper) VarArgs(f func(string) error) error { + if len(r.req.Arguments) >= len(r.req.Command.Arguments) { + for _, arg := range r.req.Arguments { + err := f(arg) + if err != nil { + return err + } + } + return nil + } + + s, err := r.req.BodyArgs() + if err != nil { + return err + } + + for s.Scan() { + err = f(s.Text()) + if err != nil { + return err + } + } + + return nil +} + +// copied from go-ipfs-cmds/request.go +func convertOptions(req *cmds.Request) error { + optDefSlice := req.Command.Options + + optDefs := make(map[string]cmdkit.Option) + for _, def := range optDefSlice { + for _, name := range def.Names() { + optDefs[name] = def + } + } + + for k, v := range req.Options { + opt, ok := optDefs[k] + if !ok { + continue + } + + kind := reflect.TypeOf(v).Kind() + if kind != opt.Type() { + if str, ok := v.(string); ok { + val, err := opt.Parse(str) + if err != nil { + value := fmt.Sprintf("value %q", v) + if len(str) == 0 { + value = "empty value" + } + return fmt.Errorf("Could not convert %q to type %q (for option %q)", + value, opt.Type().String(), "-"+k) + } + req.Options[k] = val + + } else { + return fmt.Errorf("Option %q should be type %q, but got type %q", + k, opt.Type().String(), kind.String()) + } + } + + for _, name := range opt.Names() { + if _, ok := req.Options[name]; name != k && ok { + return fmt.Errorf("Duplicate command options were provided (%q and %q)", + k, name) + } + } + } + + return nil +} diff --git a/commands/legacy/response.go b/commands/legacy/response.go new file mode 100644 index 000000000..985113b42 --- /dev/null +++ b/commands/legacy/response.go @@ -0,0 +1,205 @@ +package legacy + +import ( + "context" + "io" + "os" + "reflect" + "sync" + + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + + oldcmds "github.com/ipfs/go-ipfs/commands" +) + +// responseWrapper wraps Response and implements olcdms.Response. +// It embeds a Response so some methods are taken from that. +type responseWrapper struct { + cmds.Response + + out interface{} +} + +// Request returns a (faked) oldcmds.Request +func (rw *responseWrapper) Request() oldcmds.Request { + return &requestWrapper{rw.Response.Request(), nil} +} + +// Output returns either a <-chan interface{} on which you can receive the +// emitted values, or an emitted io.Reader +func (rw *responseWrapper) Output() interface{} { + //if not called before + if rw.out == nil { + // get first emitted value + x, err := rw.Next() + if err != nil { + return nil + } + if e, ok := x.(*cmdkit.Error); ok { + ch := make(chan interface{}) + log.Error(e) + close(ch) + return (<-chan interface{})(ch) + } + + switch v := x.(type) { + case io.Reader: + // if it's a reader, set it + rw.out = v + default: + // if it is something else, create a channel and copy values from next in there + ch := make(chan interface{}) + rw.out = (<-chan interface{})(ch) + + go func() { + defer close(ch) + ch <- v + + for { + v, err := rw.Next() + + if err == io.EOF || err == context.Canceled { + return + } + if err != nil { + log.Error(err) + return + } + + ch <- v + } + }() + } + } + + // if we have it already, return existing value + return rw.out +} + +// SetError is an empty stub +func (rw *responseWrapper) SetError(error, cmdkit.ErrorType) {} + +// SetOutput is an empty stub +func (rw *responseWrapper) SetOutput(interface{}) {} + +// SetLength is an empty stub +func (rw *responseWrapper) SetLength(uint64) {} + +// SetCloser is an empty stub +func (rw *responseWrapper) SetCloser(io.Closer) {} + +// Close is an empty stub +func (rw *responseWrapper) Close() error { return nil } + +// Marshal is an empty stub +func (rw *responseWrapper) Marshal() (io.Reader, error) { return nil, nil } + +// Reader is an empty stub +func (rw *responseWrapper) Reader() (io.Reader, error) { return nil, nil } + +// Stdout returns os.Stdout +func (rw *responseWrapper) Stdout() io.Writer { return os.Stdout } + +// Stderr returns os.Stderr +func (rw *responseWrapper) Stderr() io.Writer { return os.Stderr } + +// fakeResponse implements oldcmds.Response and takes a ResponseEmitter +type fakeResponse struct { + req oldcmds.Request + re cmds.ResponseEmitter + out interface{} + wait chan struct{} + once sync.Once +} + +// Send emits the value(s) stored in r.out on the ResponseEmitter +func (r *fakeResponse) Send(errCh chan<- error) { + defer close(errCh) + + out := r.Output() + if out == nil { + return + } + + if ch, ok := out.(chan interface{}); ok { + out = (<-chan interface{})(ch) + } + + err := r.re.Emit(out) + errCh <- err + return +} + +// Request returns the oldcmds.Request that belongs to this Response +func (r *fakeResponse) Request() oldcmds.Request { + return r.req +} + +// SetError forwards the call to the underlying ResponseEmitter +func (r *fakeResponse) SetError(err error, code cmdkit.ErrorType) { + defer r.once.Do(func() { close(r.wait) }) + r.re.SetError(err, code) +} + +// Error is an empty stub +func (r *fakeResponse) Error() *cmdkit.Error { + return nil +} + +// SetOutput sets the output variable to the passed value +func (r *fakeResponse) SetOutput(v interface{}) { + t := reflect.TypeOf(v) + _, isReader := v.(io.Reader) + + if t != nil && t.Kind() != reflect.Chan && !isReader { + v = cmds.Single{v} + } + + r.out = v + r.once.Do(func() { close(r.wait) }) +} + +// Output returns the output variable +func (r *fakeResponse) Output() interface{} { + <-r.wait + return r.out +} + +// SetLength forwards the call to the underlying ResponseEmitter +func (r *fakeResponse) SetLength(l uint64) { + r.re.SetLength(l) +} + +// Length is an empty stub +func (r *fakeResponse) Length() uint64 { + return 0 +} + +// Close forwards the call to the underlying ResponseEmitter +func (r *fakeResponse) Close() error { + return r.re.Close() +} + +// SetCloser is an empty stub +func (r *fakeResponse) SetCloser(io.Closer) {} + +// Reader is an empty stub +func (r *fakeResponse) Reader() (io.Reader, error) { + return nil, nil +} + +// Marshal is an empty stub +func (r *fakeResponse) Marshal() (io.Reader, error) { + return nil, nil +} + +// Stdout returns os.Stdout +func (r *fakeResponse) Stdout() io.Writer { + return os.Stdout +} + +// Stderr returns os.Stderr +func (r *fakeResponse) Stderr() io.Writer { + return os.Stderr +} diff --git a/commands/legacy/responseemitter.go b/commands/legacy/responseemitter.go new file mode 100644 index 000000000..e4477138c --- /dev/null +++ b/commands/legacy/responseemitter.go @@ -0,0 +1,55 @@ +package legacy + +import ( + "fmt" + "io" + + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + + oldcmds "github.com/ipfs/go-ipfs/commands" +) + +// wrappedResponseEmitter implements a ResponseEmitter by forwarding everything to an oldcmds.Response +type wrappedResponseEmitter struct { + r oldcmds.Response +} + +// SetLength forwards the call to the underlying oldcmds.Response +func (re *wrappedResponseEmitter) SetLength(l uint64) { + re.r.SetLength(l) +} + +// SetError forwards the call to the underlying oldcmds.Response +func (re *wrappedResponseEmitter) SetError(err interface{}, code cmdkit.ErrorType) { + re.r.SetError(fmt.Errorf("%v", err), code) +} + +// Close forwards the call to the underlying oldcmds.Response +func (re *wrappedResponseEmitter) Close() error { + return re.r.Close() +} + +// Emit sends the value to the underlying oldcmds.Response +func (re *wrappedResponseEmitter) Emit(v interface{}) error { + if re.r.Output() == nil { + switch c := v.(type) { + case io.Reader: + re.r.SetOutput(c) + return nil + case chan interface{}: + re.r.SetOutput(c) + return nil + case <-chan interface{}: + re.r.SetOutput(c) + return nil + default: + re.r.SetOutput(make(chan interface{})) + } + } + + go func() { + re.r.Output().(chan interface{}) <- v + }() + + return nil +} diff --git a/commands/request.go b/commands/request.go index 5625e4ca1..980e910da 100644 --- a/commands/request.go +++ b/commands/request.go @@ -15,8 +15,8 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" ) type Context struct { @@ -63,6 +63,17 @@ func (c *Context) NodeWithoutConstructing() *core.IpfsNode { return c.node } +// RootContext returns the node's context. +func (c *Context) RootContext() context.Context { + n, err := c.GetNode() + if err != nil { + log.Debug("error getting node: ", err) + return nil + } + + return n.Context() +} + // Request represents a call to a command from a consumer type Request interface { Path() []string diff --git a/commands/response.go b/commands/response.go index f2778a13a..2c66817e8 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,7 +9,8 @@ import ( "os" "strings" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) // ErrorType signfies a category of errors @@ -148,7 +149,7 @@ func (r *response) Marshal() (io.Reader, error) { return bytes.NewReader([]byte{}), nil } - enc, found, err := r.req.Option(cmdkit.EncShort).String() + enc, found, err := r.req.Option(cmds.EncShort).String() if err != nil { return nil, err } diff --git a/commands/response_test.go b/commands/response_test.go index 35e80cc18..ce1fc12cf 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,7 +6,8 @@ import ( "strings" "testing" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type TestOutput struct { @@ -28,7 +29,7 @@ func TestMarshalling(t *testing.T) { t.Error("Should have failed (no encoding type specified in request)") } - req.SetOption(cmdkit.EncShort, JSON) + req.SetOption(cmds.EncShort, JSON) reader, err := res.Marshal() if err != nil { diff --git a/core/commands/active.go b/core/commands/active.go index 9375f0c5f..a70000274 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var ActiveReqsCmd = &cmds.Command{ diff --git a/core/commands/add.go b/core/commands/add.go index 708d2d097..f721ac58a 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -1,6 +1,7 @@ package commands import ( + "context" "errors" "fmt" "io" @@ -17,9 +18,10 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) @@ -103,7 +105,7 @@ You can now check what blocks have been created by: cmdkit.FileArg("path", true, true, "The path to a file to be added to ipfs.").EnableRecursive().EnableStdin(), }, Options: []cmdkit.Option{ - cmdkit.OptionRecursivePath, // a builtin option that allows recursive paths (-r, --recursive) + cmds.OptionRecursivePath, // a builtin option that allows recursive paths (-r, --recursive) cmdkit.BoolOption(quietOptionName, "q", "Write minimal output."), cmdkit.BoolOption(quieterOptionName, "Q", "Write only final hash."), cmdkit.BoolOption(silentOptionName, "Write no output."), @@ -120,24 +122,24 @@ You can now check what blocks have been created by: cmdkit.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").WithDefault(0), cmdkit.StringOption(hashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)").WithDefault("sha2-256"), }, - PreRun: func(req cmds.Request) error { - quiet, _, _ := req.Option(quietOptionName).Bool() - quieter, _, _ := req.Option(quieterOptionName).Bool() + PreRun: func(req *cmds.Request, env interface{}) error { + quiet, _ := req.Options[quietOptionName].(bool) + quieter, _ := req.Options[quieterOptionName].(bool) quiet = quiet || quieter - silent, _, _ := req.Option(silentOptionName).Bool() + silent, _ := req.Options[silentOptionName].(bool) if quiet || silent { return nil } // ipfs cli progress bar defaults to true unless quiet or silent is used - _, found, _ := req.Option(progressOptionName).Bool() + _, found := req.Options[progressOptionName].(bool) if !found { - req.SetOption(progressOptionName, true) + req.Options[progressOptionName] = true } - sizeFile, ok := req.Files().(files.SizeFile) + sizeFile, ok := req.Files.(files.SizeFile) if !ok { // we don't need to error, the progress bar just won't know how big the files are log.Warning("cannot determine size of input file") @@ -145,7 +147,7 @@ You can now check what blocks have been created by: } sizeCh := make(chan int64, 1) - req.Values()["size"] = sizeCh + req.Context = context.WithValue(req.Context, "size", sizeCh) go func() { size, err := sizeFile.Size() @@ -160,8 +162,9 @@ You can now check what blocks have been created by: return nil }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + fmt.Printf("%#v\n", req) + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -180,19 +183,19 @@ You can now check what blocks have been created by: // return //} - progress, _, _ := req.Option(progressOptionName).Bool() - trickle, _, _ := req.Option(trickleOptionName).Bool() - wrap, _, _ := req.Option(wrapOptionName).Bool() - hash, _, _ := req.Option(onlyHashOptionName).Bool() - hidden, _, _ := req.Option(hiddenOptionName).Bool() - silent, _, _ := req.Option(silentOptionName).Bool() - chunker, _, _ := req.Option(chunkerOptionName).String() - dopin, _, _ := req.Option(pinOptionName).Bool() - rawblks, rbset, _ := req.Option(rawLeavesOptionName).Bool() - nocopy, _, _ := req.Option(noCopyOptionName).Bool() - fscache, _, _ := req.Option(fstoreCacheOptionName).Bool() - cidVer, _, _ := req.Option(cidVersionOptionName).Int() - hashFunStr, hfset, _ := req.Option(hashOptionName).String() + progress, _ := req.Options[progressOptionName].(bool) + trickle, _ := req.Options[trickleOptionName].(bool) + wrap, _ := req.Options[wrapOptionName].(bool) + hash, _ := req.Options[onlyHashOptionName].(bool) + hidden, _ := req.Options[hiddenOptionName].(bool) + silent, _ := req.Options[silentOptionName].(bool) + chunker, _ := req.Options[chunkerOptionName].(string) + dopin, _ := req.Options[pinOptionName].(bool) + rawblks, rbset := req.Options[rawLeavesOptionName].(bool) + nocopy, _ := req.Options[noCopyOptionName].(bool) + fscache, _ := req.Options[fstoreCacheOptionName].(bool) + cidVer, _ := req.Options[cidVersionOptionName].(int) + hashFunStr, hfset := req.Options[hashOptionName].(string) if nocopy && !cfg.Experimental.FilestoreEnabled { res.SetError(errors.New("filestore is not enabled, see https://git.io/vy4XN"), @@ -209,14 +212,10 @@ You can now check what blocks have been created by: return } - if hfset && cidVer == 0 { + if hfset && hashFunStr != "sha2-256" && cidVer == 0 { cidVer = 1 } - if cidVer >= 1 && !rbset { - rawblks = true - } - prefix, err := dag.PrefixForCidVersion(cidVer) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -251,7 +250,7 @@ You can now check what blocks have been created by: } exch := n.Exchange - local, _, _ := req.Option("local").Bool() + local, _ := req.Options["local"].(bool) if local { exch = offline.Exchange(addblockstore) } @@ -261,7 +260,7 @@ You can now check what blocks have been created by: outChan := make(chan interface{}, adderOutChanSize) - fileAdder, err := coreunix.NewAdder(req.Context(), n.Pinning, n.Blockstore, dserv) + fileAdder, err := coreunix.NewAdder(req.Context, n.Pinning, n.Blockstore, dserv) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -281,7 +280,7 @@ You can now check what blocks have been created by: if hash { md := dagtest.Mock() - mr, err := mfs.NewRoot(req.Context(), md, ft.EmptyDirNode(), nil) + mr, err := mfs.NewRoot(req.Context, md, ft.EmptyDirNode(), nil) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -325,7 +324,7 @@ You can now check what blocks have been created by: var err error defer func() { errCh <- err }() defer close(outChan) - err = addAllAndPin(req.Files()) + err = addAllAndPin(req.Files) }() defer res.Close() @@ -340,21 +339,19 @@ You can now check what blocks have been created by: res.SetError(err, cmdkit.ErrNormal) } }, - PostRun: map[cmds.EncodingType]func(cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { - ctx := req.Context() - + PostRun: cmds.PostRunMap{ + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) outChan := make(chan interface{}) progressBar := func(wait chan struct{}) { defer close(wait) - quiet, _, _ := req.Option(quietOptionName).Bool() - quieter, _, _ := req.Option(quieterOptionName).Bool() + quiet, _ := req.Options[quietOptionName].(bool) + quieter, _ := req.Options[quieterOptionName].(bool) quiet = quiet || quieter - progress, _, _ := req.Option(progressOptionName).Bool() + progress, _ := req.Options[progressOptionName].(bool) var bar *pb.ProgressBar if progress { @@ -367,10 +364,7 @@ You can now check what blocks have been created by: } var sizeChan chan int64 - s, found := req.Values()["size"] - if found { - sizeChan = s.(chan int64) - } + sizeChan, _ = req.Context.Value("size").(chan int64) lastFile := "" lastHash := "" @@ -431,6 +425,9 @@ You can now check what blocks have been created by: bar.ShowBar = true bar.ShowTimeLeft = true } + case <-req.Context.Done(): + re.SetError(req.Context.Err(), cmdkit.ErrNormal) + return } } } @@ -459,8 +456,8 @@ You can now check what blocks have been created by: select { case outChan <- v: - case <-ctx.Done(): - re.SetError(ctx.Err(), cmdkit.ErrNormal) + case <-req.Context.Done(): + re.SetError(req.Context.Err(), cmdkit.ErrNormal) return } } diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 429f16d14..a9bc1c8c5 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -6,13 +6,15 @@ import ( "io" oldcmds "github.com/ipfs/go-ipfs/commands" + lgc "github.com/ipfs/go-ipfs/commands/legacy" e "github.com/ipfs/go-ipfs/core/commands/e" bitswap "github.com/ipfs/go-ipfs/exchange/bitswap" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) @@ -24,13 +26,11 @@ var BitswapCmd = &cmds.Command{ }, Subcommands: map[string]*cmds.Command{ - "stat": bitswapStatCmd, - }, - OldSubcommands: map[string]*oldcmds.Command{ - "wantlist": showWantlistCmd, - "unwant": unwantCmd, - "ledger": ledgerCmd, - "reprovide": reprovideCmd, + "stat": bitswapStatCmd, + "wantlist": lgc.NewCommand(showWantlistCmd), + "unwant": lgc.NewCommand(unwantCmd), + "ledger": lgc.NewCommand(ledgerCmd), + "reprovide": lgc.NewCommand(reprovideCmd), }, } @@ -140,8 +140,8 @@ var bitswapStatCmd = &cmds.Command{ ShortDescription: ``, }, Type: bitswap.Stat{}, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - nd, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -167,7 +167,7 @@ var bitswapStatCmd = &cmds.Command{ cmds.EmitOnce(res, st) }, Encoders: cmds.EncoderMap{ - cmds.Text: cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { out, ok := v.(*bitswap.Stat) if !ok { return e.TypeErr(out, v) diff --git a/core/commands/block.go b/core/commands/block.go index 01fe61bda..5b3f36ccf 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -2,6 +2,7 @@ package commands import ( "bytes" + "context" "fmt" "io" "io/ioutil" @@ -9,9 +10,9 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" @@ -60,8 +61,8 @@ on raw IPFS blocks. It outputs the following to stdout: Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to stat.").EnableStdin(), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - b, err := getBlockForKey(req, req.Arguments()[0]) + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -77,7 +78,7 @@ on raw IPFS blocks. It outputs the following to stdout: }, Type: BlockStat{}, Encoders: cmds.EncoderMap{ - cmds.Text: cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { bs, ok := v.(*BlockStat) if !ok { return e.TypeErr(bs, v) @@ -100,8 +101,8 @@ It outputs to stdout, and is a base58 encoded multihash. Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to get.").EnableStdin(), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - b, err := getBlockForKey(req, req.Arguments()[0]) + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -131,14 +132,14 @@ It reads from stdin, and is a base58 encoded multihash. cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"), cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - file, err := req.Files().NextFile() + file, err := req.Files.NextFile() if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -159,7 +160,7 @@ It reads from stdin, and is a base58 encoded multihash. var pref cid.Prefix pref.Version = 1 - format, _, _ := req.Option("format").String() + format, _ := req.Options["format"].(string) formatval, ok := cid.Codecs[format] if !ok { res.SetError(fmt.Errorf("unrecognized format: %s", format), cmdkit.ErrNormal) @@ -170,7 +171,7 @@ It reads from stdin, and is a base58 encoded multihash. } pref.Codec = formatval - mhtype, _, _ := req.Option("mhtype").String() + mhtype, _ := req.Options["mhtype"].(string) mhtval, ok := mh.Names[mhtype] if !ok { err := fmt.Errorf("unrecognized multihash function: %s", mhtype) @@ -179,9 +180,9 @@ It reads from stdin, and is a base58 encoded multihash. } pref.MhType = mhtval - mhlen, _, err := req.Option("mhlen").Int() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) + mhlen, ok := req.Options["mhlen"].(int) + if !ok { + res.SetError("missing option \"mhlen\"", cmdkit.ErrNormal) return } pref.MhLength = mhlen @@ -213,7 +214,7 @@ It reads from stdin, and is a base58 encoded multihash. } }, Encoders: cmds.EncoderMap{ - cmds.Text: cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { bs, ok := v.(*BlockStat) if !ok { return e.TypeErr(bs, v) @@ -225,12 +226,12 @@ It reads from stdin, and is a base58 encoded multihash. Type: BlockStat{}, } -func getBlockForKey(req cmds.Request, skey string) (blocks.Block, error) { +func getBlockForKey(ctx context.Context, env interface{}, skey string) (blocks.Block, error) { if len(skey) == 0 { return nil, fmt.Errorf("zero length cid invalid") } - n, err := req.InvocContext().GetNode() + n, err := GetNode(env) if err != nil { return nil, err } @@ -240,7 +241,7 @@ func getBlockForKey(req cmds.Request, skey string) (blocks.Block, error) { return nil, err } - b, err := n.Blocks.GetBlock(req.Context(), c) + b, err := n.Blocks.GetBlock(ctx, c) if err != nil { return nil, err } @@ -263,15 +264,15 @@ It takes a list of base58 encoded multihashs to remove. cmdkit.BoolOption("force", "f", "Ignore nonexistent blocks."), cmdkit.BoolOption("quiet", "q", "Write minimal output."), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - hashes := req.Arguments() - force, _, _ := req.Option("force").Bool() - quiet, _, _ := req.Option("quiet").Bool() + hashes := req.Arguments + force, _ := req.Options["force"].(bool) + quiet, _ := req.Options["quiet"].(bool) cids := make([]*cid.Cid, 0, len(hashes)) for _, hash := range hashes { c, err := cid.Decode(hash) @@ -298,8 +299,8 @@ It takes a list of base58 encoded multihashs to remove. log.Error(err) } }, - PostRun: map[cmds.EncodingType]func(cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { + PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) go func() { diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index 3940ed374..16f76c02e 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -12,7 +12,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type BootstrapOutput struct { diff --git a/core/commands/cat.go b/core/commands/cat.go index 778f80478..bbe3ab09a 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB @@ -28,8 +28,8 @@ var CatCmd = &cmds.Command{ cmdkit.IntOption("offset", "o", "Byte offset to begin reading from."), cmdkit.IntOption("length", "l", "Maximum number of bytes to read."), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - node, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + node, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -41,11 +41,8 @@ var CatCmd = &cmds.Command{ return } } - offset, _, err := req.Option("offset").Int() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) - return - } + + offset, _ := req.Options["offset"].(int) if offset < 0 { res.SetError(fmt.Errorf("Cannot specify negative offset."), cmdkit.ErrNormal) return @@ -64,6 +61,12 @@ var CatCmd = &cmds.Command{ max = -1 } + err = req.ParseBodyArgs() + if err != nil && err.Error() != "all arguments covered by positional arguments" { + res.SetError(err, cmdkit.ErrNormal) + return + } + readers, length, err := cat(req.Context(), node, req.Arguments(), int64(offset), int64(max)) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -71,7 +74,7 @@ var CatCmd = &cmds.Command{ } /* - if err := corerepo.ConditionalGC(req.Context(), node, length); err != nil { + if err := corerepo.ConditionalGC(req.Context, node, length); err != nil { re.SetError(err, cmdkit.ErrNormal) return } @@ -89,8 +92,8 @@ var CatCmd = &cmds.Command{ res.SetError(err, cmdkit.ErrNormal) } }, - PostRun: map[cmds.EncodingType]func(cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { + PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) go func() { diff --git a/core/commands/commands.go b/core/commands/commands.go index 244a5b7db..2da3e934f 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -11,11 +11,11 @@ import ( "sort" "strings" - oldcmds "github.com/ipfs/go-ipfs/commands" + // oldcmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type commandEncoder struct { @@ -69,16 +69,16 @@ func CommandsCmd(root *cmds.Command) *cmds.Command { Options: []cmdkit.Option{ cmdkit.BoolOption(flagsOptionName, "f", "Show command flags"), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { rootCmd := cmd2outputCmd("ipfs", root) - rootCmd.showOpts, _, _ = req.Option(flagsOptionName).Bool() + rootCmd.showOpts, _ = req.Options[flagsOptionName].(bool) err := res.Emit(&rootCmd) if err != nil { log.Error(err) } }, Encoders: cmds.EncoderMap{ - cmds.Text: func(req cmds.Request) func(io.Writer) cmds.Encoder { + cmds.Text: func(req *cmds.Request) func(io.Writer) cmds.Encoder { return func(w io.Writer) cmds.Encoder { return &commandEncoder{w} } }, }, @@ -94,51 +94,12 @@ func cmd2outputCmd(name string, cmd *cmds.Command) Command { output := Command{ Name: name, - Subcommands: make([]Command, len(cmd.Subcommands)+len(cmd.OldSubcommands)), + Subcommands: make([]Command, 0, len(cmd.Subcommands)), Options: opts, } - // we need to keep track of names because a name *might* be used by both a Subcommand and an OldSubscommand. - names := make(map[string]struct{}) - - i := 0 for name, sub := range cmd.Subcommands { - names[name] = struct{}{} - output.Subcommands[i] = cmd2outputCmd(name, sub) - i++ - } - - for name, sub := range cmd.OldSubcommands { - if _, ok := names[name]; ok { - continue - } - - names[name] = struct{}{} - output.Subcommands[i] = oldCmd2outputCmd(name, sub) - i++ - } - - // trucate to the amount of names we actually have - output.Subcommands = output.Subcommands[:len(names)] - return output -} - -func oldCmd2outputCmd(name string, cmd *oldcmds.Command) Command { - opts := make([]Option, len(cmd.Options)) - for i, opt := range cmd.Options { - opts[i] = Option{opt.Names()} - } - - output := Command{ - Name: name, - Subcommands: make([]Command, len(cmd.Subcommands)), - Options: opts, - } - - i := 0 - for name, sub := range cmd.Subcommands { - output.Subcommands[i] = oldCmd2outputCmd(name, sub) - i++ + output.Subcommands = append(output.Subcommands, cmd2outputCmd(name, sub)) } return output diff --git a/core/commands/config.go b/core/commands/config.go index 55e0af8f8..69891c0db 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type ConfigField struct { diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index aa4943d61..eb47e640e 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -13,8 +13,8 @@ import ( path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" - files "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/dht.go b/core/commands/dht.go index 10ee42197..73cbebfbe 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -15,8 +15,8 @@ import ( routing "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing" notif "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing/notifications" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/diag.go b/core/commands/diag.go index fa4904bec..5cad94246 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var DiagCmd = &cmds.Command{ diff --git a/core/commands/dns.go b/core/commands/dns.go index fde78c0c9..eed4b0bf8 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -8,7 +8,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" namesys "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var DNSCmd = &cmds.Command{ diff --git a/core/commands/env.go b/core/commands/env.go new file mode 100644 index 000000000..42fad0ecc --- /dev/null +++ b/core/commands/env.go @@ -0,0 +1,27 @@ +package commands + +import ( + "fmt" + + "github.com/ipfs/go-ipfs/commands" + "github.com/ipfs/go-ipfs/core" + "github.com/ipfs/go-ipfs/repo/config" +) + +func GetNode(env interface{}) (*core.IpfsNode, error) { + ctx, ok := env.(*commands.Context) + if !ok { + return nil, fmt.Errorf("expected env to be of type %T, got %T", ctx, env) + } + + return ctx.GetNode() +} + +func GetConfig(env interface{}) (*config.Config, error) { + ctx, ok := env.(*commands.Context) + if !ok { + return nil, fmt.Errorf("expected env to be of type %T, got %T", ctx, env) + } + + return ctx.GetConfig() +} diff --git a/core/commands/external.go b/core/commands/external.go index 3aceaa782..cfcc4cce8 100644 --- a/core/commands/external.go +++ b/core/commands/external.go @@ -10,7 +10,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) func ExternalBinary() *cmds.Command { diff --git a/core/commands/files/files.go b/core/commands/files/files.go index 623c6ea4b..c84ad5c91 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -18,10 +18,10 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 5ec5265ee..5a6b4340b 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -11,8 +11,9 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "github.com/ipfs/go-ipfs/filestore" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + lgc "github.com/ipfs/go-ipfs/commands/legacy" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) @@ -21,11 +22,9 @@ var FileStoreCmd = &cmds.Command{ Tagline: "Interact with filestore objects.", }, Subcommands: map[string]*cmds.Command{ - "ls": lsFileStore, - }, - OldSubcommands: map[string]*oldCmds.Command{ - "verify": verifyFileStore, - "dups": dupsFileStore, + "ls": lsFileStore, + "verify": lgc.NewCommand(verifyFileStore), + "dups": lgc.NewCommand(dupsFileStore), }, } @@ -54,15 +53,15 @@ The output is: Options: []cmdkit.Option{ cmdkit.BoolOption("file-order", "sort the results based on the path of the backing file"), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - _, fs, err := getFilestore(req.InvocContext()) + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + _, fs, err := getFilestore(env.(*oldCmds.Context)) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - args := req.Arguments() + args := req.Arguments if len(args) > 0 { - out := perKeyActionToChan(req.Context(), args, func(c *cid.Cid) *filestore.ListRes { + out := perKeyActionToChan(req.Context, args, func(c *cid.Cid) *filestore.ListRes { return filestore.List(fs, c) }) @@ -71,14 +70,14 @@ The output is: log.Error(err) } } else { - fileOrder, _, _ := req.Option("file-order").Bool() + fileOrder, _ := req.Options["file-order"].(bool) next, err := filestore.ListAll(fs, fileOrder) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - out := listResToChan(req.Context(), next) + out := listResToChan(req.Context, next) err = res.Emit(out) if err != nil { log.Error(err) @@ -86,7 +85,7 @@ The output is: } }, PostRun: cmds.PostRunMap{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) go func() { @@ -236,12 +235,8 @@ var dupsFileStore = &oldCmds.Command{ Type: RefWrapper{}, } -type getNoder interface { - GetNode() (*core.IpfsNode, error) -} - -func getFilestore(g getNoder) (*core.IpfsNode, *filestore.Filestore, error) { - n, err := g.GetNode() +func getFilestore(env interface{}) (*core.IpfsNode, *filestore.Filestore, error) { + n, err := GetNode(env) if err != nil { return nil, nil, err } diff --git a/core/commands/get.go b/core/commands/get.go index f12f92adb..4c95ee752 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) @@ -48,12 +48,12 @@ may also specify the level of compression by specifying '-l=<1-9>'. cmdkit.BoolOption("compress", "C", "Compress the output with GZIP compression."), cmdkit.IntOption("compression-level", "l", "The level of compression (1-9).").WithDefault(-1), }, - PreRun: func(req cmds.Request) error { + PreRun: func(req *cmds.Request, env interface{}) error { _, err := getCompressOptions(req) return err }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - if len(req.Arguments()) == 0 { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + if len(req.Arguments) == 0 { res.SetError(errors.New("not enough arugments provided"), cmdkit.ErrClient) return } @@ -63,13 +63,13 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } - node, err := req.InvocContext().GetNode() + node, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - p := path.Path(req.Arguments()[0]) - ctx := req.Context() + p := path.Path(req.Arguments[0]) + ctx := req.Context dn, err := core.Resolve(ctx, node.Namesys, node.Resolver, p) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -92,7 +92,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } - archive, _, _ := req.Option("archive").Bool() + archive, _ := req.Options["archive"].(bool) reader, err := uarchive.DagArchive(ctx, dn, p.String(), node.DAG, archive, cmplvl) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -101,8 +101,8 @@ may also specify the level of compression by specifying '-l=<1-9>'. res.Emit(reader) }, - PostRun: map[cmds.EncodingType]func(cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { + PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) go func() { @@ -119,7 +119,11 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } - outPath := getOutPath(req) + outPath, _ := req.Options["output"].(string) + if len(outPath) == 0 { + _, outPath = gopath.Split(req.Arguments[0]) + outPath = gopath.Clean(outPath) + } cmplvl, err := getCompressOptions(req) if err != nil { @@ -127,7 +131,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } - archive, _, _ := req.Option("archive").Bool() + archive, _ := req.Options["archive"].(bool) gw := getWriter{ Out: os.Stdout, @@ -183,10 +187,10 @@ func makeProgressBar(out io.Writer, l int64) *pb.ProgressBar { return bar } -func getOutPath(req cmds.Request) string { - outPath, _, _ := req.Option("output").String() +func getOutPath(req *cmds.Request) string { + outPath, _ := req.Options["output"].(string) if outPath == "" { - trimmed := strings.TrimRight(req.Arguments()[0], "/") + trimmed := strings.TrimRight(req.Arguments[0], "/") _, outPath = gopath.Split(trimmed) outPath = gopath.Clean(outPath) } @@ -251,9 +255,9 @@ func (gw *getWriter) writeExtracted(r io.Reader, fpath string) error { return extractor.Extract(r) } -func getCompressOptions(req cmds.Request) (int, error) { - cmprs, _, _ := req.Option("compress").Bool() - cmplvl, cmplvlFound, _ := req.Option("compression-level").Int() +func getCompressOptions(req *cmds.Request) (int, error) { + cmprs, _ := req.Options["compress"].(bool) + cmplvl, cmplvlFound := req.Options["compression-level"].(int) switch { case !cmprs: return gzip.NoCompression, nil diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 14040e163..615acd5c2 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -1,10 +1,11 @@ package commands import ( + "context" "testing" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) func TestGetOutputPath(t *testing.T) { @@ -44,13 +45,15 @@ func TestGetOutputPath(t *testing.T) { }, } - defOpts, err := GetCmd.GetOptions([]string{}) - if err != nil { - t.Fatalf("error getting default command options: %v", err) - } + /* + defOpts, err := GetCmd.GetOptions([]string{}) + if err != nil { + t.Fatalf("error getting default command options: %v", err) + } + */ for _, tc := range cases { - req, err := cmds.NewRequest([]string{}, tc.opts, tc.args, nil, GetCmd, defOpts) + req, err := cmds.NewRequest(context.TODO(), []string{}, tc.opts, tc.args, nil, GetCmd) if err != nil { t.Fatalf("error creating a command request: %v", err) } diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index cb3d11e37..a0c56fcbe 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/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 index 9a3808009..1982ff695 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -13,9 +13,10 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" kb "gx/ipfs/QmQEo84PQQPJpx9Bf2YxerGVgmgWvQ9iwuZBAJaNJKWREr/go-libp2p-kbucket" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" identify "gx/ipfs/Qma23bpHwQrQyvKeBemaeJh7sAoRHggPkgnge1B9489ff5/go-libp2p/p2p/protocol/identify" ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" diff --git a/core/commands/ipns.go b/core/commands/ipns.go index 0424c3868..ff7b4b6b5 100644 --- a/core/commands/ipns.go +++ b/core/commands/ipns.go @@ -10,7 +10,7 @@ import ( namesys "github.com/ipfs/go-ipfs/namesys" offline "github.com/ipfs/go-ipfs/routing/offline" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var IpnsCmd = &cmds.Command{ diff --git a/core/commands/keystore.go b/core/commands/keystore.go index d52469ebf..cc2b64048 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -12,7 +12,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/log.go b/core/commands/log.go index cf4b3106b..a4ac317e0 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -6,8 +6,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) // Golang os.Args overrides * and replaces the character argument with diff --git a/core/commands/ls.go b/core/commands/ls.go index 28eef1051..125c76587 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -18,7 +18,7 @@ import ( unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index 2341a017c..abf4c3f2a 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -6,7 +6,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index d7c847893..4729a36a4 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -13,7 +13,7 @@ import ( nodeMount "github.com/ipfs/go-ipfs/fuse/node" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index 1cdc006e9..956fc0913 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -5,7 +5,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/name.go b/core/commands/name.go index d7069cc47..cece92945 100644 --- a/core/commands/name.go +++ b/core/commands/name.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type IpnsEntry struct { diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index 74e20f4df..e1f4f95d0 100644 --- a/core/commands/object/diff.go +++ b/core/commands/object/diff.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" dagutils "github.com/ipfs/go-ipfs/merkledag/utils" path "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type Changes struct { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 3b05191c7..81f9dbde9 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -21,7 +21,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index 5e16433ae..4066e38e1 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -13,7 +13,7 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var ObjectPatchCmd = &cmds.Command{ diff --git a/core/commands/p2p.go b/core/commands/p2p.go index ffb210613..0ea8590c5 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" ) diff --git a/core/commands/pin.go b/core/commands/pin.go index d24317c55..d01e7befa 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -16,8 +16,9 @@ import ( pin "github.com/ipfs/go-ipfs/pin" uio "github.com/ipfs/go-ipfs/unixfs/io" + cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/ping.go b/core/commands/ping.go index 6a88df108..f492bf375 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -13,7 +13,7 @@ import ( core "github.com/ipfs/go-ipfs/core" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/publish.go b/core/commands/publish.go index f7dd36f40..6d0d562aa 100644 --- a/core/commands/publish.go +++ b/core/commands/publish.go @@ -14,7 +14,7 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" crypto "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 445a40bd8..12a5300b7 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,8 +12,8 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" @@ -70,8 +70,8 @@ This command outputs data in the following encodings: Options: []cmdkit.Option{ cmdkit.BoolOption("discover", "try to discover other peers subscribed to the same topic"), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -88,7 +88,7 @@ This command outputs data in the following encodings: return } - topic := req.Arguments()[0] + topic := req.Arguments[0] sub, err := n.Floodsub.Subscribe(topic) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -96,7 +96,7 @@ This command outputs data in the following encodings: } defer sub.Cancel() - discover, _, _ := req.Option("discover").Bool() + discover, _ := req.Options["discover"].(bool) if discover { go func() { blk := blocks.NewBlock([]byte("floodsub:" + topic)) @@ -106,7 +106,7 @@ This command outputs data in the following encodings: return } - connectToPubSubPeers(req.Context(), n, cid) + connectToPubSubPeers(req.Context, n, cid) }() } @@ -115,7 +115,7 @@ This command outputs data in the following encodings: } for { - msg, err := sub.Next(req.Context()) + msg, err := sub.Next(req.Context) if err == io.EOF || err == context.Canceled { return } else if err != nil { @@ -127,7 +127,7 @@ This command outputs data in the following encodings: } }, Encoders: cmds.EncoderMap{ - cmds.Text: cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { m, ok := v.(*floodsub.Message) if !ok { return fmt.Errorf("unexpected type: %T", v) @@ -136,7 +136,7 @@ This command outputs data in the following encodings: _, err := w.Write(m.Data) return err }), - "ndpayload": cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + "ndpayload": cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { m, ok := v.(*floodsub.Message) if !ok { return fmt.Errorf("unexpected type: %T", v) @@ -146,7 +146,7 @@ This command outputs data in the following encodings: _, err := w.Write(m.Data) return err }), - "lenpayload": cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + "lenpayload": cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { m, ok := v.(*floodsub.Message) if !ok { return fmt.Errorf("unexpected type: %T", v) @@ -203,8 +203,8 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. cmdkit.StringArg("topic", true, false, "Topic to publish to."), cmdkit.StringArg("data", true, true, "Payload of message to publish.").EnableStdin(), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -221,9 +221,9 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. return } - topic := req.Arguments()[0] + topic := req.Arguments[0] - for _, data := range req.Arguments()[1:] { + for _, data := range req.Arguments[1:] { if err := n.Floodsub.Publish(topic, []byte(data)); err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -244,8 +244,8 @@ to be used in a production environment. To use, the daemon must be run with '--enable-pubsub-experiment'. `, }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -286,8 +286,8 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. Arguments: []cmdkit.Argument{ cmdkit.StringArg("topic", false, false, "topic to list connected peers of"), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -305,8 +305,8 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. } var topic string - if len(req.Arguments()) == 1 { - topic = req.Arguments()[0] + if len(req.Arguments) == 1 { + topic = req.Arguments[0] } for _, peer := range n.Floodsub.ListPeers(topic) { diff --git a/core/commands/refs.go b/core/commands/refs.go index 035d77302..b0621accd 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -14,7 +14,7 @@ import ( path "github.com/ipfs/go-ipfs/path" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index 98f38f478..1636e722a 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -17,8 +17,9 @@ import ( fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + lgc "github.com/ipfs/go-ipfs/commands/legacy" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) @@ -35,13 +36,11 @@ var RepoCmd = &cmds.Command{ }, Subcommands: map[string]*cmds.Command{ - "stat": repoStatCmd, - }, - OldSubcommands: map[string]*oldcmds.Command{ - "gc": repoGcCmd, - "fsck": RepoFsckCmd, - "version": repoVersionCmd, - "verify": repoVerifyCmd, + "stat": repoStatCmd, + "gc": lgc.NewCommand(repoGcCmd), + "fsck": lgc.NewCommand(RepoFsckCmd), + "version": lgc.NewCommand(repoVersionCmd), + "verify": lgc.NewCommand(repoVerifyCmd), }, } @@ -160,14 +159,14 @@ RepoSize int Size in bytes that the repo is currently taking. Version string The repo version. `, }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - n, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - stat, err := corerepo.RepoStat(n, req.Context()) + stat, err := corerepo.RepoStat(n, req.Context) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -180,16 +179,13 @@ Version string The repo version. }, Type: corerepo.Stat{}, Encoders: cmds.EncoderMap{ - cmds.Text: cmds.MakeEncoder(func(req cmds.Request, w io.Writer, v interface{}) error { + cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error { stat, ok := v.(*corerepo.Stat) if !ok { return e.TypeErr(stat, v) } - human, _, err := req.Option("human").Bool() - if err != nil { - return err - } + human, _ := req.Options["human"].(bool) wtr := tabwriter.NewWriter(w, 0, 0, 1, ' ', 0) diff --git a/core/commands/resolve.go b/core/commands/resolve.go index daed89878..eb0df3b44 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -10,7 +10,7 @@ import ( ns "github.com/ipfs/go-ipfs/namesys" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type ResolvedPath struct { diff --git a/core/commands/root.go b/core/commands/root.go index e49a2271b..593a48916 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -11,9 +11,10 @@ import ( ocmd "github.com/ipfs/go-ipfs/core/commands/object" unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var log = logging.Logger("core/commands") @@ -91,6 +92,11 @@ The CLI will exit with one of the following values: cmdkit.BoolOption("h", "Show a short version of the command help text."), cmdkit.BoolOption("local", "L", "Run the command locally, instead of using the daemon."), cmdkit.StringOption(ApiOption, "Use a specific API instance (defaults to /ip4/127.0.0.1/tcp/5001)"), + + // global options, added to every command + cmds.OptionEncodingType, + cmds.OptionStreamChannels, + cmds.OptionTimeout, }, } @@ -108,34 +114,31 @@ var rootSubcommands = map[string]*cmds.Command{ "pubsub": PubsubCmd, "repo": RepoCmd, "stats": StatsCmd, -} - -var rootOldSubcommands = map[string]*oldcmds.Command{ - "bootstrap": BootstrapCmd, - "config": ConfigCmd, - "dag": dag.DagCmd, - "dht": DhtCmd, - "diag": DiagCmd, - "dns": DNSCmd, - "files": files.FilesCmd, - "id": IDCmd, - "key": KeyCmd, - "log": LogCmd, - "ls": LsCmd, - "mount": MountCmd, - "name": NameCmd, - "object": ocmd.ObjectCmd, - "pin": PinCmd, - "ping": PingCmd, - "p2p": P2PCmd, - "refs": RefsCmd, - "resolve": ResolveCmd, - "swarm": SwarmCmd, - "tar": TarCmd, - "file": unixfs.UnixFSCmd, - "update": ExternalBinary(), - "version": VersionCmd, - "shutdown": daemonShutdownCmd, + "bootstrap": lgc.NewCommand(BootstrapCmd), + "config": lgc.NewCommand(ConfigCmd), + "dag": lgc.NewCommand(dag.DagCmd), + "dht": lgc.NewCommand(DhtCmd), + "diag": lgc.NewCommand(DiagCmd), + "dns": lgc.NewCommand(DNSCmd), + "files": lgc.NewCommand(files.FilesCmd), + "id": lgc.NewCommand(IDCmd), + "key": lgc.NewCommand(KeyCmd), + "log": lgc.NewCommand(LogCmd), + "ls": lgc.NewCommand(LsCmd), + "mount": lgc.NewCommand(MountCmd), + "name": lgc.NewCommand(NameCmd), + "object": lgc.NewCommand(ocmd.ObjectCmd), + "pin": lgc.NewCommand(PinCmd), + "ping": lgc.NewCommand(PingCmd), + "p2p": lgc.NewCommand(P2PCmd), + "refs": lgc.NewCommand(RefsCmd), + "resolve": lgc.NewCommand(ResolveCmd), + "swarm": lgc.NewCommand(SwarmCmd), + "tar": lgc.NewCommand(TarCmd), + "file": lgc.NewCommand(unixfs.UnixFSCmd), + "update": lgc.NewCommand(ExternalBinary()), + "version": lgc.NewCommand(VersionCmd), + "shutdown": lgc.NewCommand(daemonShutdownCmd), } // RootRO is the readonly version of Root @@ -155,33 +158,30 @@ var rootROSubcommands = map[string]*cmds.Command{ }, }, "get": GetCmd, -} - -var rootROOldSubcommands = map[string]*oldcmds.Command{ - "dns": DNSCmd, - "ls": LsCmd, - "name": &oldcmds.Command{ + "dns": lgc.NewCommand(DNSCmd), + "ls": lgc.NewCommand(LsCmd), + "name": lgc.NewCommand(&oldcmds.Command{ Subcommands: map[string]*oldcmds.Command{ "resolve": IpnsCmd, }, - }, - "object": &oldcmds.Command{ + }), + "object": lgc.NewCommand(&oldcmds.Command{ Subcommands: map[string]*oldcmds.Command{ "data": ocmd.ObjectDataCmd, "links": ocmd.ObjectLinksCmd, "get": ocmd.ObjectGetCmd, "stat": ocmd.ObjectStatCmd, }, - }, - "dag": &oldcmds.Command{ + }), + "dag": lgc.NewCommand(&oldcmds.Command{ Subcommands: map[string]*oldcmds.Command{ "get": dag.DagGetCmd, "resolve": dag.DagResolveCmd, }, - }, - "refs": RefsROCmd, - "resolve": ResolveCmd, - "version": VersionCmd, + }), + "refs": lgc.NewCommand(RefsROCmd), + "resolve": lgc.NewCommand(ResolveCmd), + "version": lgc.NewCommand(VersionCmd), } func init() { @@ -192,10 +192,8 @@ func init() { *RefsROCmd = *RefsCmd RefsROCmd.Subcommands = map[string]*oldcmds.Command{} - Root.OldSubcommands = rootOldSubcommands Root.Subcommands = rootSubcommands - RootRO.OldSubcommands = rootROOldSubcommands RootRO.Subcommands = rootROSubcommands } diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go index bcaa3bbb6..6aa80c71a 100644 --- a/core/commands/shutdown.go +++ b/core/commands/shutdown.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/core/commands/stat.go b/core/commands/stat.go index e7f7ee6d4..a80e29d89 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,7 +9,8 @@ import ( cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" @@ -79,8 +80,8 @@ Example: "ns", "us" (or "µs"), "ms", "s", "m", "h".`).WithDefault("1s"), }, - Run: func(req cmds.Request, res cmds.ResponseEmitter) { - nd, err := req.InvocContext().GetNode() + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -97,17 +98,8 @@ Example: return } - pstr, pfound, err := req.Option("peer").String() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) - return - } - - tstr, tfound, err := req.Option("proto").String() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) - return - } + pstr, pfound := req.Options["peer"].(string) + tstr, tfound := req.Options["proto"].(string) if pfound && tfound { res.SetError(errors.New("please only specify peer OR protocol"), cmdkit.ErrClient) return @@ -123,23 +115,14 @@ Example: pid = checkpid } - timeS, _, err := req.Option("interval").String() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) - return - } + timeS, _ := req.Options["interval"].(string) interval, err := time.ParseDuration(timeS) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } - doPoll, _, err := req.Option("poll").Bool() - if err != nil { - res.SetError(err, cmdkit.ErrNormal) - return - } - + doPoll, _ := req.Options["poll"].(bool) for { if pfound { stats := nd.Reporter.GetBandwidthForPeer(pid) @@ -157,7 +140,7 @@ Example: } select { case <-time.After(interval): - case <-req.Context().Done(): + case <-req.Context.Done(): return } } @@ -165,17 +148,13 @@ Example: }, Type: metrics.Stats{}, PostRun: cmds.PostRunMap{ - cmds.CLI: func(req cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { + cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) go func() { defer re.Close() - polling, _, err := res.Request().Option("poll").Bool() - if err != nil { - return - } - + polling, _ := res.Request().Options["poll"].(bool) fmt.Fprintln(os.Stdout, "Total Up Total Down Rate Up Rate Down") for { v, err := res.Next() diff --git a/core/commands/swarm.go b/core/commands/swarm.go index dd17575e9..6cdf9fecb 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -15,9 +15,9 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" swarm "gx/ipfs/QmUhvp4VoQ9cKDVLqAxciEKdm8ymBx2Syx4C1Tv6SmSTPa/go-libp2p-swarm" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" iaddr "gx/ipfs/QmdMeXVB1V1SAZcFzoCuM3zR9K8PeuzCYg4zXNHcHh6dHU/go-ipfs-addr" diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 7bd7badb6..314d061b8 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -8,8 +8,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" ) diff --git a/core/commands/tar.go b/core/commands/tar.go index 811d7295f..4e43cd131 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -12,7 +12,7 @@ import ( path "github.com/ipfs/go-ipfs/path" tar "github.com/ipfs/go-ipfs/tar" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var TarCmd = &cmds.Command{ diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index 855ba0b06..dcc9910ac 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -15,7 +15,7 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/unixfs/unixfs.go b/core/commands/unixfs/unixfs.go index d94f9b44b..92d6c72f4 100644 --- a/core/commands/unixfs/unixfs.go +++ b/core/commands/unixfs/unixfs.go @@ -4,7 +4,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var UnixFSCmd = &cmds.Command{ diff --git a/core/commands/version.go b/core/commands/version.go index 57609996e..4fb675657 100644 --- a/core/commands/version.go +++ b/core/commands/version.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type VersionOutput struct { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 3a95203c5..cc4be85fe 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -7,12 +7,13 @@ import ( "strconv" "strings" + oldcmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" corecommands "github.com/ipfs/go-ipfs/core/commands" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds/http" + cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/http" ) const originEnvKey = "API_ORIGIN" @@ -29,6 +30,8 @@ or ipfs daemon --api-http-header 'Access-Control-Allow-Origin: *' ` +const APIPath = "/api/v0" + var defaultLocalhostOrigins = []string{ "http://127.0.0.1:", "https://127.0.0.1:", @@ -100,7 +103,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) { c.SetAllowedOrigins(origins...) } -func commandsOption(cctx cmds.Context, command *cmds.Command) ServeOption { +func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) { cfg := cmdsHttp.NewServerConfig() @@ -115,16 +118,16 @@ func commandsOption(cctx cmds.Context, command *cmds.Command) ServeOption { addCORSDefaults(cfg) patchCORSVars(cfg, l.Addr()) - cmdHandler := cmdsHttp.NewHandler(cctx, command, cfg) - mux.Handle(cmdsHttp.ApiPath+"/", cmdHandler) + cmdHandler := cmdsHttp.NewHandler(&cctx, command, cfg) + mux.Handle(APIPath, cmdHandler) return mux, nil } } -func CommandsOption(cctx cmds.Context) ServeOption { +func CommandsOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.Root) } -func CommandsROOption(cctx cmds.Context) ServeOption { +func CommandsROOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) } diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 0d4e816f6..4663dc64b 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -25,8 +25,8 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - files "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 0173ff2f9..a48110a94 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -19,9 +19,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2" pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" - "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go index f579fba38..43a1e386f 100644 --- a/importer/helpers/dagbuilder.go +++ b/importer/helpers/dagbuilder.go @@ -9,7 +9,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - files "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/importer.go b/importer/importer.go index a5832e860..45a0da994 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -11,7 +11,7 @@ import ( h "github.com/ipfs/go-ipfs/importer/helpers" trickle "github.com/ipfs/go-ipfs/importer/trickle" dag "github.com/ipfs/go-ipfs/merkledag" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" ) diff --git a/package.json b/package.json index b4ecb2591..7c9f0f19c 100644 --- a/package.json +++ b/package.json @@ -414,14 +414,14 @@ "version": "2.1.2" }, { - "hash": "QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH", + "hash": "QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K", "name": "go-ipfs-cmds", - "version": "0.4.15" + "version": "0.5.0-dev" }, { - "hash": "QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD", + "hash": "QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps", "name": "go-ipfs-cmdkit", - "version": "0.3.6" + "version": "1.0.0-dev" }, { "author": "whyrusleeping", From c1d6230bc0e03f25b04f607f8d8ed9158656338c Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 27 Nov 2017 17:42:41 +0100 Subject: [PATCH 02/55] check api version in corehttp - add comments, trim api path prefix - corehttp: add option to set HTTP header "Server" - daemon: use new corehttp options License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 4 ++ core/corehttp/commands.go | 47 +++++++++++++++ core/corehttp/option_test.go | 113 +++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 core/corehttp/option_test.go diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 6ee5aa4e2..048d35a25 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -17,6 +17,7 @@ import ( corehttp "github.com/ipfs/go-ipfs/core/corehttp" corerepo "github.com/ipfs/go-ipfs/core/corerepo" nodeMount "github.com/ipfs/go-ipfs/fuse/node" + config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" @@ -432,6 +433,8 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), corehttp.CommandsOption(*cctx), + corehttp.CheckVersionOption(), + corehttp.ServerNameOption("go-ipfs/" + config.CurrentVersionNumber), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), @@ -529,6 +532,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e corehttp.VersionOption(), corehttp.IPNSHostnameOption(), corehttp.GatewayOption(writable, "/ipfs", "/ipns"), + corehttp.CheckVersionOption(), } if len(cfg.Gateway.RootRedirect) > 0 { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index cc4be85fe..c3d476531 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -1,6 +1,8 @@ package corehttp import ( + "errors" + "fmt" "net" "net/http" "os" @@ -10,12 +12,18 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" corecommands "github.com/ipfs/go-ipfs/core/commands" + path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdsHttp "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/http" ) +var ( + errApiVersionMismatch = errors.New("api version mismatch") +) + +const apiPath = "/api/v0" const originEnvKey = "API_ORIGIN" const originEnvKeyDeprecate = `You are using the ` + originEnvKey + `ENV Variable. This functionality is deprecated, and will be removed in future versions. @@ -131,3 +139,42 @@ func CommandsOption(cctx oldcmds.Context) ServeOption { func CommandsROOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) } + +// CheckVersionOption returns a ServeOption that checks whether the client ipfs version matches. Does nothing when the user agent string does not contain `/go-ipfs/` +func CheckVersionOption() ServeOption { + daemonVersion := config.ApiVersion + + return ServeOption(func(n *core.IpfsNode, l net.Listener, next *http.ServeMux) (*http.ServeMux, error) { + mux := http.NewServeMux() + mux.HandleFunc(APIPath+"/", func(w http.ResponseWriter, r *http.Request) { + pth := path.SplitList(r.URL.Path[len(APIPath):]) + // backwards compatibility to previous version check + if pth[1] != "version" { + clientVersion := r.UserAgent() + // skips check if client is not go-ipfs + if clientVersion != "" && strings.Contains(clientVersion, "/go-ipfs/") && daemonVersion != clientVersion { + http.Error(w, fmt.Sprintf("%s (%s != %s)", errApiVersionMismatch, daemonVersion, clientVersion), http.StatusBadRequest) + return + } + } + + next.ServeHTTP(w, r) + }) + mux.HandleFunc("/", next.ServeHTTP) + + return mux, nil + }) +} + +// ServerNameOption returns a ServeOption that makes the http server set the Server HTTP header. +func ServerNameOption(name string) ServeOption { + return ServeOption(func(n *core.IpfsNode, l net.Listener, next *http.ServeMux) (*http.ServeMux, error) { + mux := http.NewServeMux() + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Server", name) + next.ServeHTTP(w, r) + }) + + return mux, nil + }) +} diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go new file mode 100644 index 000000000..37c88cce4 --- /dev/null +++ b/core/corehttp/option_test.go @@ -0,0 +1,113 @@ +package corehttp + +import ( + "fmt" + "io" + "net/http" + "net/http/httptest" + "testing" + + config "github.com/ipfs/go-ipfs/repo/config" +) + +type testcasecheckversion struct { + userAgent string + uri string + shouldHandle bool + responseBody string + responseCode int +} + +func (tc testcasecheckversion) body() string { + if !tc.shouldHandle && tc.responseBody == "" { + return fmt.Sprintf("%s (%s != %s)\n", errApiVersionMismatch, config.ApiVersion, tc.userAgent) + } + + return tc.responseBody +} + +func TestCheckVersionOption(t *testing.T) { + tcs := []testcasecheckversion{ + {"/go-ipfs/0.1/", APIPath + "/test/", false, "", http.StatusBadRequest}, + {"/go-ipfs/0.1/", APIPath + "/version", true, "check!", http.StatusOK}, + {config.ApiVersion, APIPath + "/test", true, "check!", http.StatusOK}, + {"Mozilla Firefox/no go-ipfs node", APIPath + "/test", true, "check!", http.StatusOK}, + {"/go-ipfs/0.1/", "/webui", true, "check!", http.StatusOK}, + } + + for _, tc := range tcs { + t.Logf("%#v", tc) + r := httptest.NewRequest("POST", tc.uri, nil) + r.Header.Add("User-Agent", tc.userAgent) // old version, should fail + + called := false + inner := http.NewServeMux() + inner.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + called = true + if !tc.shouldHandle { + t.Error("handler was called even though version didn't match") + } else { + io.WriteString(w, "check!") + } + }) + + mux, err := CheckVersionOption()(nil, nil, inner) + if err != nil { + t.Fatal(err) + } + + w := httptest.NewRecorder() + + mux.ServeHTTP(w, r) + + if tc.shouldHandle && !called { + t.Error("handler wasn't called even though it should have") + } + + if w.Code != tc.responseCode { + t.Errorf("expected code %d but got %d", tc.responseCode, w.Code) + } + + if w.Body.String() != tc.body() { + t.Errorf("expected error message %q, got %q", tc.body(), w.Body.String()) + } + } +} + +func TestServerNameOption(t *testing.T) { + type testcase struct { + name string + } + + tcs := []testcase{ + {"go-ipfs/0.4.13"}, + {"go-ipfs/" + config.CurrentVersionNumber}, + } + + assert := func(name string, exp, got interface{}) { + if got != exp { + t.Errorf("%s: got %q, expected %q", name, got, exp) + } + } + + for _, tc := range tcs { + t.Logf("%#v", tc) + r := httptest.NewRequest("POST", "/", nil) + + inner := http.NewServeMux() + inner.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + // this block is intentionally left blank. + }) + + mux, err := ServerNameOption(tc.name)(nil, nil, inner) + if err != nil { + t.Fatal(err) + } + + w := httptest.NewRecorder() + + mux.ServeHTTP(w, r) + srvHdr := w.Header().Get("Server") + assert("Server header", tc.name, srvHdr) + } +} From 9965861b867492e6cbff4180ec258b06bcc8c303 Mon Sep 17 00:00:00 2001 From: keks Date: Thu, 30 Nov 2017 17:11:30 +0100 Subject: [PATCH 03/55] fmt License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 7 ++++--- cmd/ipfs/main.go | 4 ---- cmd/ipfswatch/main.go | 1 - core/commands/add.go | 1 - core/commands/bitswap.go | 1 - core/commands/id.go | 1 - core/commands/ipnsps.go | 2 +- core/commands/pin.go | 3 +-- core/commands/stat.go | 1 - 9 files changed, 6 insertions(+), 15 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 048d35a25..cb8427d77 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -12,8 +12,9 @@ import ( "sync" utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util" + oldcmds "github.com/ipfs/go-ipfs/commands" "github.com/ipfs/go-ipfs/core" - oldcmds "github.com/ipfs/go-ipfs/core/commands" + commands "github.com/ipfs/go-ipfs/core/commands" corehttp "github.com/ipfs/go-ipfs/core/corehttp" corerepo "github.com/ipfs/go-ipfs/core/corerepo" nodeMount "github.com/ipfs/go-ipfs/fuse/node" @@ -279,7 +280,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { } offline, _ := req.Options[offlineKwd].(bool) - ipnsps, _, _ := req.Options[enableIPNSPubSubKwd].(bool) + ipnsps, _ := req.Options[enableIPNSPubSubKwd].(bool) pubsub, _ := req.Options[enableFloodSubKwd].(bool) mplex, _ := req.Options[enableMultiplexKwd].(bool) @@ -403,7 +404,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil } - apiAddr, _ := req.Options[oldcmds.ApiOption].(string) + apiAddr, _ := req.Options[commands.ApiOption].(string) if apiAddr == "" { apiAddr = cfg.Addresses.API } diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 726c675e0..85538da0f 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -26,11 +26,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds/cli" - "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds/http" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 092079d7f..6a8dda1b0 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -18,7 +18,6 @@ import ( homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir" - commands "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" fsnotify "gx/ipfs/QmczzCMvJ3HV57WBKDy8b4ucp7quT325JjDbixYRS5Pwvv/fsnotify.v1" ) diff --git a/core/commands/add.go b/core/commands/add.go index f721ac58a..db8293e49 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,7 +18,6 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files" "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index a9bc1c8c5..e9b3e654a 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -11,7 +11,6 @@ import ( bitswap "github.com/ipfs/go-ipfs/exchange/bitswap" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" diff --git a/core/commands/id.go b/core/commands/id.go index 1982ff695..551b4091c 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -16,7 +16,6 @@ import ( b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" identify "gx/ipfs/Qma23bpHwQrQyvKeBemaeJh7sAoRHggPkgnge1B9489ff5/go-libp2p/p2p/protocol/identify" ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" diff --git a/core/commands/ipnsps.go b/core/commands/ipnsps.go index 176d86f69..a8439b57f 100644 --- a/core/commands/ipnsps.go +++ b/core/commands/ipnsps.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" ns "github.com/ipfs/go-ipfs/namesys" - cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type ipnsPubsubState struct { diff --git a/core/commands/pin.go b/core/commands/pin.go index d01e7befa..6c060bf4d 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -16,9 +16,8 @@ import ( pin "github.com/ipfs/go-ipfs/pin" uio "github.com/ipfs/go-ipfs/unixfs/io" - cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util" + "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/stat.go b/core/commands/stat.go index a80e29d89..0f6fb7b3f 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -7,7 +7,6 @@ import ( "os" "time" - cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" From 84101c8a2aa45a223492f0aa73a9f863f5686f93 Mon Sep 17 00:00:00 2001 From: keks Date: Fri, 1 Dec 2017 10:40:26 +0100 Subject: [PATCH 04/55] go test passes, sharness fails pass API path to cmds, fix options in add. License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 8 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 17 +-- commands/command.go | 2 +- commands/command_test.go | 4 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 4 +- commands/response.go | 4 +- commands/response_test.go | 4 +- core/commands/add.go | 16 ++- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 188 +++++++++++++++++++++++++++++ core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 29 ++--- package.json | 2 +- test/sharness/t0040-add-and-cat.sh | 2 +- 29 files changed, 255 insertions(+), 59 deletions(-) create mode 100644 core/commands/commands_test.go diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index cb8427d77..d6fd2f3d7 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -18,16 +18,16 @@ import ( corehttp "github.com/ipfs/go-ipfs/core/corehttp" corerepo "github.com/ipfs/go-ipfs/core/corerepo" nodeMount "github.com/ipfs/go-ipfs/fuse/node" - config "github.com/ipfs/go-ipfs/repo/config" + //config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) @@ -434,8 +434,8 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), corehttp.CommandsOption(*cctx), - corehttp.CheckVersionOption(), - corehttp.ServerNameOption("go-ipfs/" + config.CurrentVersionNumber), + //corehttp.CheckVersionOption(), + //corehttp.ServerNameOption("go-ipfs/" + config.CurrentVersionNumber), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index de94bb71b..1725cc580 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 85538da0f..0ad81b8f5 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -21,6 +21,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" coreCmds "github.com/ipfs/go-ipfs/core/commands" + corehttp "github.com/ipfs/go-ipfs/core/corehttp" "github.com/ipfs/go-ipfs/plugin/loader" repo "github.com/ipfs/go-ipfs/repo" config "github.com/ipfs/go-ipfs/repo/config" @@ -30,12 +31,12 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/cli" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/http" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/cli" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/http" ) // log is the command logger @@ -269,11 +270,11 @@ func (i *cmdInvocation) Parse(ctx context.Context, args []string) error { // if no encoding was specified by user, default to plaintext encoding // (if command doesn't support plaintext, use JSON instead) - if enc := i.req.Options[cmds.EncShort]; enc == "" { + if enc := i.req.Options[cmds.EncLong]; enc == "" { if i.req.Command.Encoders != nil && i.req.Command.Encoders[cmds.Text] != nil { - i.req.SetOption(cmds.EncShort, cmds.Text) + i.req.SetOption(cmds.EncLong, cmds.Text) } else { - i.req.SetOption(cmds.EncShort, cmds.JSON) + i.req.SetOption(cmds.EncLong, cmds.JSON) } } @@ -313,7 +314,7 @@ func callCommand(ctx context.Context, req *cmds.Request, root *cmds.Command, cct return err } - encTypeStr, _ := req.Options[cmds.EncShort].(string) + encTypeStr, _ := req.Options[cmds.EncLong].(string) encType := cmds.EncodingType(encTypeStr) var ( @@ -658,7 +659,7 @@ func apiClientForAddr(addr ma.Multiaddr) (http.Client, error) { return nil, err } - return http.NewClient(host), nil + return http.NewClient(host, http.ClientWithAPIPrefix(corehttp.APIPath)), nil } func isConnRefused(err error) bool { diff --git a/commands/command.go b/commands/command.go index 3454d5bd2..332b09b7e 100644 --- a/commands/command.go +++ b/commands/command.go @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-ipfs/path" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 634e871fb..883415089 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) func noop(req Request, res Response) { @@ -59,7 +59,7 @@ func TestOptionValidation(t *testing.T) { } req, _ = NewRequest(nil, nil, nil, nil, nil, opts) - req.SetOption(cmds.EncShort, "json") + req.SetOption(cmds.EncLong, "json") res = cmd.Call(req) if res.Error() != nil { t.Error("Should have passed") diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 543872eda..4fb9cfdd6 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 543809f54..92196872b 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index a91d5855b..e4855317b 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index cc8377d27..e18576408 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 985113b42..4560a8514 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) @@ -47,6 +47,8 @@ func (rw *responseWrapper) Output() interface{} { case io.Reader: // if it's a reader, set it rw.out = v + case cmds.Single: + rw.out = v.Value default: // if it is something else, create a channel and copy values from next in there ch := make(chan interface{}) diff --git a/commands/response.go b/commands/response.go index 2c66817e8..668766529 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) // ErrorType signfies a category of errors @@ -149,7 +149,7 @@ func (r *response) Marshal() (io.Reader, error) { return bytes.NewReader([]byte{}), nil } - enc, found, err := r.req.Option(cmds.EncShort).String() + enc, found, err := r.req.Option(cmds.EncLong).String() if err != nil { return nil, err } diff --git a/commands/response_test.go b/commands/response_test.go index ce1fc12cf..80d182636 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) type TestOutput struct { @@ -29,7 +29,7 @@ func TestMarshalling(t *testing.T) { t.Error("Should have failed (no encoding type specified in request)") } - req.SetOption(cmds.EncShort, JSON) + req.SetOption(cmds.EncLong, JSON) reader, err := res.Marshal() if err != nil { diff --git a/core/commands/add.go b/core/commands/add.go index db8293e49..513a13dc2 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,10 +18,10 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) @@ -162,7 +162,6 @@ You can now check what blocks have been created by: return nil }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { - fmt.Printf("%#v\n", req) n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -202,6 +201,15 @@ You can now check what blocks have been created by: return } + if hfset && hashFunStr != "sha2-256" && cidVer == 0 { + cidVer = 1 + } + + if cidVer > 0 && !rbset { + rawblks = true + } + + // if rawblocks is not explicitly set but nocopy is, set rawblocks if nocopy && !rbset { rawblks = true } @@ -211,10 +219,6 @@ You can now check what blocks have been created by: return } - if hfset && hashFunStr != "sha2-256" && cidVer == 0 { - cidVer = 1 - } - prefix, err := dag.PrefixForCidVersion(cidVer) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index e9b3e654a..383bb742a 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,9 +12,9 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 5b3f36ccf..93e349297 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,9 +11,9 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/cat.go b/core/commands/cat.go index bbe3ab09a..c97bd737d 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index 2da3e934f..f7851c049 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,8 +14,8 @@ import ( // oldcmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go new file mode 100644 index 000000000..3da9e87a2 --- /dev/null +++ b/core/commands/commands_test.go @@ -0,0 +1,188 @@ +package commands + +import ( + "strings" + "testing" + + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" +) + +func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { + for name, sub := range cmd.Subcommands { + path := prefix + "/" + name + out[path] = struct{}{} + collectPaths(path, sub, out) + } +} + +func TestCommands(t *testing.T) { + list := []string{ + "/add", + "/bitswap", + "/bitswap/ledger", + "/bitswap/reprovide", + "/bitswap/stat", + "/bitswap/unwant", + "/bitswap/wantlist", + "/block", + "/block/get", + "/block/put", + "/block/rm", + "/block/stat", + "/bootstrap", + "/bootstrap/add", + "/bootstrap/add/default", + "/bootstrap/list", + "/bootstrap/rm", + "/bootstrap/rm/all", + "/cat", + "/commands", + "/config", + "/config/edit", + "/config/replace", + "/config/show", + "/dag", + "/dag/get", + "/dag/put", + "/dag/resolve", + "/dht", + "/dht/findpeer", + "/dht/findprovs", + "/dht/get", + "/dht/provide", + "/dht/put", + "/dht/query", + "/diag", + "/diag/cmds", + "/diag/cmds/clear", + "/diag/cmds/set-time", + "/diag/sys", + "/dns", + "/file", + "/file/ls", + "/files", + "/files/chcid", + "/files/cp", + "/files/flush", + "/files/ls", + "/files/mkdir", + "/files/mv", + "/files/read", + "/files/rm", + "/files/stat", + "/filestore", + "/filestore/dups", + "/filestore/ls", + "/filestore/verify", + "/files/write", + "/get", + "/id", + "/key", + "/key/gen", + "/key/list", + "/key/rename", + "/key/rm", + "/log", + "/log/level", + "/log/ls", + "/log/tail", + "/ls", + "/mount", + "/name", + "/name/publish", + "/name/pubsub", + "/name/pubsub/state", + "/name/pubsub/subs", + "/name/pubsub/cancel", + "/name/resolve", + "/object", + "/object/data", + "/object/diff", + "/object/get", + "/object/links", + "/object/new", + "/object/patch", + "/object/patch/add-link", + "/object/patch/append-data", + "/object/patch/rm-link", + "/object/patch/set-data", + "/object/put", + "/object/stat", + "/p2p", + "/p2p/listener", + "/p2p/listener/close", + "/p2p/listener/ls", + "/p2p/listener/open", + "/p2p/stream", + "/p2p/stream/close", + "/p2p/stream/dial", + "/p2p/stream/ls", + "/pin", + "/pin/add", + "/ping", + "/pin/ls", + "/pin/rm", + "/pin/update", + "/pin/verify", + "/pubsub", + "/pubsub/ls", + "/pubsub/peers", + "/pubsub/pub", + "/pubsub/sub", + "/refs", + "/refs/local", + "/repo", + "/repo/fsck", + "/repo/gc", + "/repo/stat", + "/repo/verify", + "/repo/version", + "/resolve", + "/shutdown", + "/stats", + "/stats/bitswap", + "/stats/bw", + "/stats/repo", + "/swarm", + "/swarm/addrs", + "/swarm/addrs/listen", + "/swarm/addrs/local", + "/swarm/connect", + "/swarm/disconnect", + "/swarm/filters", + "/swarm/filters/add", + "/swarm/filters/rm", + "/swarm/peers", + "/tar", + "/tar/add", + "/tar/cat", + "/update", + "/version", + } + + cmdSet := make(map[string]struct{}) + collectPaths("", Root, cmdSet) + + for _, path := range list { + if _, ok := cmdSet[path]; !ok { + t.Errorf("%q not in result", path) + } else { + delete(cmdSet, path) + } + } + + for path := range cmdSet { + t.Errorf("%q in result but shouldn't be", path) + } + + for _, path := range list { + path = path[1:] // remove leading slash + split := strings.Split(path, "/") + sub, err := Root.Get(split) + if err != nil { + t.Errorf("error getting subcommand %q: %v", path, err) + } else if sub == nil { + t.Errorf("subcommand %q is nil even though there was no error", path) + } + } +} diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 5a6b4340b..275fe179d 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 4c95ee752..dc3e7a727 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 615acd5c2..c7f975b2b 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index a0c56fcbe..1fc6724fa 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 12a5300b7..72d68f635 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,9 +12,9 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index 1636e722a..007a73300 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,8 +18,8 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index 593a48916..3bef53e97 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -13,8 +13,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 0f6fb7b3f..a737060d5 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,9 +8,9 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" ) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index c3d476531..4a545bc0a 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,15 +15,14 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds/http" + cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/http" ) var ( errApiVersionMismatch = errors.New("api version mismatch") ) -const apiPath = "/api/v0" const originEnvKey = "API_ORIGIN" const originEnvKeyDeprecate = `You are using the ` + originEnvKey + `ENV Variable. This functionality is deprecated, and will be removed in future versions. @@ -116,6 +115,7 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { cfg := cmdsHttp.NewServerConfig() cfg.SetAllowedMethods("GET", "POST", "PUT") + cfg.APIPath = APIPath rcfg, err := n.Repo.Config() if err != nil { return nil, err @@ -127,7 +127,7 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { patchCORSVars(cfg, l.Addr()) cmdHandler := cmdsHttp.NewHandler(&cctx, command, cfg) - mux.Handle(APIPath, cmdHandler) + mux.Handle(APIPath+"/", cmdHandler) return mux, nil } } @@ -146,21 +146,22 @@ func CheckVersionOption() ServeOption { return ServeOption(func(n *core.IpfsNode, l net.Listener, next *http.ServeMux) (*http.ServeMux, error) { mux := http.NewServeMux() - mux.HandleFunc(APIPath+"/", func(w http.ResponseWriter, r *http.Request) { - pth := path.SplitList(r.URL.Path[len(APIPath):]) - // backwards compatibility to previous version check - if pth[1] != "version" { - clientVersion := r.UserAgent() - // skips check if client is not go-ipfs - if clientVersion != "" && strings.Contains(clientVersion, "/go-ipfs/") && daemonVersion != clientVersion { - http.Error(w, fmt.Sprintf("%s (%s != %s)", errApiVersionMismatch, daemonVersion, clientVersion), http.StatusBadRequest) - return + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + if strings.HasPrefix(r.URL.Path, APIPath) { + pth := path.SplitList(r.URL.Path[len(APIPath):]) + // backwards compatibility to previous version check + if pth[1] != "version" { + clientVersion := r.UserAgent() + // skips check if client is not go-ipfs + if clientVersion != "" && strings.Contains(clientVersion, "/go-ipfs/") && daemonVersion != clientVersion { + http.Error(w, fmt.Sprintf("%s (%s != %s)", errApiVersionMismatch, daemonVersion, clientVersion), http.StatusBadRequest) + return + } } } next.ServeHTTP(w, r) }) - mux.HandleFunc("/", next.ServeHTTP) return mux, nil }) diff --git a/package.json b/package.json index 7c9f0f19c..4c5284371 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K", + "hash": "QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps", "name": "go-ipfs-cmds", "version": "0.5.0-dev" }, diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh index e863353b6..c4a05a7fe 100755 --- a/test/sharness/t0040-add-and-cat.sh +++ b/test/sharness/t0040-add-and-cat.sh @@ -554,7 +554,7 @@ test_add_cat_expensive "--cid-version=1" "zdj7WcatQrtuE4WMkS4XsfsMixuQN2po4irkYh # encoded with the blake2b-256 hash funtion test_add_cat_expensive '--hash=blake2b-256' "zDMZof1kwndounDzQCANUHjiE3zt1mPEgx7RE3JTHoZrRRa79xcv" -test_add_named_pipe " Post http://$API_ADDR/api/v0/add?encoding=json&progress=true&r=true&stream-channels=true:" +test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&cid-version=0&encoding=json&hash=sha2-256&pin=true&progress=true&recursive=true&stream-channels=true:" test_add_pwd_is_symlink From feef5c3415ec249cf307f43a422545de24aee319 Mon Sep 17 00:00:00 2001 From: keks Date: Thu, 7 Dec 2017 19:33:25 +0100 Subject: [PATCH 05/55] cmds: use Executors - some fixes for cmds1.0 - reinsert plugin loading code, pretty print wrapper TODO: if plugin loading fails it only calls log.Warning. returning an error would be better but that would have to happen after PreRun, which is not possible atm. License: MIT Signed-off-by: keks --- cmd/ipfs/main.go | 326 +++++++--------------------------- commands/legacy/request.go | 27 ++- commands/request.go | 29 +++ core/commands/add.go | 2 +- core/commands/dag/dag.go | 3 + core/commands/files/files.go | 20 ++- core/commands/get.go | 6 +- core/commands/object/patch.go | 7 +- repo/config/init.go | 5 + 9 files changed, 144 insertions(+), 281 deletions(-) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 0ad81b8f5..0528418c0 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -22,7 +22,7 @@ import ( core "github.com/ipfs/go-ipfs/core" coreCmds "github.com/ipfs/go-ipfs/core/commands" corehttp "github.com/ipfs/go-ipfs/core/corehttp" - "github.com/ipfs/go-ipfs/plugin/loader" + loader "github.com/ipfs/go-ipfs/plugin/loader" repo "github.com/ipfs/go-ipfs/repo" config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" @@ -31,7 +31,6 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" @@ -90,96 +89,64 @@ func mainRet() int { } defer stopFunc() // to be executed as late as possible - var invoc cmdInvocation - defer invoc.close() - - // this is a local helper to print out help text. - // there's some considerations that this makes easier. - printHelp := func(long bool, w io.Writer) { - helpFunc := cli.ShortHelp - if long { - helpFunc = cli.LongHelp - } - - var p []string - if invoc.req != nil { - p = invoc.req.Path - } - - helpFunc("ipfs", Root, p, w) - } - - // this is a message to tell the user how to get the help text - printMetaHelp := func(w io.Writer) { - cmdPath := strings.Join(invoc.req.Path, " ") - fmt.Fprintf(w, "Use 'ipfs %s --help' for information about this command\n", cmdPath) - } + intrh, ctx := setupInterruptHandler(ctx) + defer intrh.Close() // Handle `ipfs help' if len(os.Args) == 2 { if os.Args[1] == "help" { - printHelp(false, os.Stdout) - return 0 + os.Args[1] = "-h" } else if os.Args[1] == "--version" { os.Args[1] = "version" } } - intrh, ctx := invoc.SetupInterruptHandler(ctx) - defer intrh.Close() - - // parse the commandline into a command invocation - parseErr := invoc.Parse(ctx, os.Args[1:]) - - // BEFORE handling the parse error, if we have enough information - // AND the user requested help, print it out and exit - if invoc.req != nil { - longH, shortH, err := invoc.requestedHelp() + buildEnv := func(ctx context.Context, req *cmds.Request) (interface{}, error) { + repoPath, err := getRepoPath(req) if err != nil { - printErr(err) - return 1 - } - if longH || shortH { - printHelp(longH, os.Stdout) - return 0 + return nil, err } + log.Debugf("config path is %s", repoPath) + + // this sets up the function that will initialize the config lazily. + + // this sets up the function that will initialize the node + // this is so that we can construct the node lazily. + + return &oldcmds.Context{ + ConfigRoot: repoPath, + LoadConfig: loadConfig, + ReqLog: &oldcmds.ReqLog{}, + ConstructNode: func() (n *core.IpfsNode, err error) { + if req == nil { + return nil, errors.New("constructing node without a request") + } + + r, err := fsrepo.Open(repoPath) + if err != nil { // repo is owned by the node + return nil, err + } + + // ok everything is good. set it on the invocation (for ownership) + // and return it. + n, err = core.NewNode(ctx, &core.BuildCfg{ + // TODO(keks) figure out how Online was set before. I think it was set to + // a value that always is the zero value so we can just drop it, but + // I'll have to check that. + Repo: r, + }) + if err != nil { + return nil, err + } + + n.SetLocal(true) + return n, nil + }, + }, nil } - // ok now handle parse error (which means cli input was wrong, - // e.g. incorrect number of args, or nonexistent subcommand) - if parseErr != nil { - printErr(parseErr) - - // this was a user error, print help. - if invoc.req != nil && invoc.req.Command != nil { - // we need a newline space. - fmt.Fprintf(os.Stderr, "\n") - printHelp(false, os.Stderr) - } - return 1 - } - - // here we handle the cases where - // - commands with no Run func are invoked directly. - // - the main command is invoked. - if invoc.req == nil || invoc.req.Command == nil || invoc.req.Command.Run == nil { - printHelp(false, os.Stdout) - return 0 - } - - // ok, finally, run the command invocation. - err = invoc.Run(ctx) + err = cli.Run(ctx, Root, os.Args, os.Stdin, os.Stdout, os.Stderr, buildEnv, makeExecutor) if err != nil { - if code, ok := err.(exitErr); ok { - return int(code) - } - - printErr(err) - - // if this error was a client error, print short help too. - if isClientError(err) { - printMetaHelp(os.Stderr) - } return 1 } @@ -187,10 +154,9 @@ func mainRet() int { return 0 } -func (i *cmdInvocation) Run(ctx context.Context) error { - +func checkDebug(req *cmds.Request) { // check if user wants to debug. option OR env var. - debug, _ := i.req.Options["debug"].(bool) + debug, _ := req.Options["debug"].(bool) if debug || os.Getenv("IPFS_LOGGING") == "debug" { u.Debug = true logging.SetDebugLogging() @@ -198,193 +164,33 @@ func (i *cmdInvocation) Run(ctx context.Context) error { if u.GetenvBool("DEBUG") { u.Debug = true } - - return callCommand(ctx, i.req, Root, i.ctx) } -func (i *cmdInvocation) constructNodeFunc(ctx context.Context) func() (*core.IpfsNode, error) { - return func() (n *core.IpfsNode, err error) { - if i.req == nil { - return nil, errors.New("constructing node without a request") - } - - r, err := fsrepo.Open(i.ctx.ConfigRoot) - if err != nil { // repo is owned by the node - return nil, err - } - - // ok everything is good. set it on the invocation (for ownership) - // and return it. - n, err = core.NewNode(ctx, &core.BuildCfg{ - Online: i.ctx.Online, - Repo: r, - }) - if err != nil { - return nil, err - } - n.SetLocal(true) - i.node = n - return i.node, nil - } -} - -func (i *cmdInvocation) close() { - // let's not forget teardown. If a node was initialized, we must close it. - // Note that this means the underlying req.Context().Node variable is exposed. - // this is gross, and should be changed when we extract out the exec Context. - if i.node != nil { - log.Info("Shutting down node...") - i.node.Close() - } -} - -func (i *cmdInvocation) Parse(ctx context.Context, args []string) error { - var err error - - i.req, err = cli.Parse(args, os.Stdin, Root) +func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) { + checkDebug(req) + details, err := commandDetails(req.Path, Root) if err != nil { - return err + return nil, err } - //TODO remove this - //fmt.Printf("%#v\n", i.req) - - // TODO(keks): pass this as arg to cli.Parse() - i.req.Context = ctx - - repoPath, err := getRepoPath(i.req) + client, err := commandShouldRunOnDaemon(*details, req, Root, env.(*oldcmds.Context)) if err != nil { - return err - } - log.Debugf("config path is %s", repoPath) - - // this sets up the function that will initialize the config lazily. - if i.ctx == nil { - i.ctx = &oldcmds.Context{} - } - i.ctx.ConfigRoot = repoPath - i.ctx.LoadConfig = loadConfig - // this sets up the function that will initialize the node - // this is so that we can construct the node lazily. - i.ctx.ConstructNode = i.constructNodeFunc(ctx) - - // if no encoding was specified by user, default to plaintext encoding - // (if command doesn't support plaintext, use JSON instead) - if enc := i.req.Options[cmds.EncLong]; enc == "" { - if i.req.Command.Encoders != nil && i.req.Command.Encoders[cmds.Text] != nil { - i.req.SetOption(cmds.EncLong, cmds.Text) - } else { - i.req.SetOption(cmds.EncLong, cmds.JSON) - } + return nil, err } - return nil -} - -func (i *cmdInvocation) requestedHelp() (short bool, long bool, err error) { - longHelp, _ := i.req.Options["help"].(bool) - shortHelp, _ := i.req.Options["h"].(bool) - return longHelp, shortHelp, nil -} - -func callPreCommandHooks(ctx context.Context, details cmdDetails, req *cmds.Request, root *cmds.Command) error { - - log.Event(ctx, "callPreCommandHooks", &details) - log.Debug("calling pre-command hooks...") - - return nil -} - -func callCommand(ctx context.Context, req *cmds.Request, root *cmds.Command, cctx *oldcmds.Context) error { - log.Info(config.EnvDir, " ", cctx.ConfigRoot) - cmd := req.Command - - details, err := commandDetails(req.Path, root) - if err != nil { - return err - } - - client, err := commandShouldRunOnDaemon(*details, req, root, cctx) - if err != nil { - return err - } - - err = callPreCommandHooks(ctx, *details, req, root) - if err != nil { - return err - } - - encTypeStr, _ := req.Options[cmds.EncLong].(string) - encType := cmds.EncodingType(encTypeStr) - - var ( - re cmds.ResponseEmitter - exitCh <-chan int - ) - - // first if condition checks the command's encoder map, second checks global encoder map (cmd vs. cmds) - if enc, ok := cmd.Encoders[encType]; ok { - re, exitCh = cli.NewResponseEmitter(os.Stdout, os.Stderr, enc, req) - } else if enc, ok := cmds.Encoders[encType]; ok { - re, exitCh = cli.NewResponseEmitter(os.Stdout, os.Stderr, enc, req) + var exctr cmds.Executor + if client != nil && !req.Command.External { + exctr = client.(cmds.Executor) } else { - return fmt.Errorf("could not find matching encoder for enctype %#v", encType) - } - - if cmd.PreRun != nil { - err = cmd.PreRun(req, cctx) - if err != nil { - return err - } - } - - if cmd.PostRun != nil && cmd.PostRun[cmds.CLI] != nil { - re = cmd.PostRun[cmds.CLI](req, re) - } - - if client != nil && !cmd.External { - log.Debug("executing command via API") - - res, err := client.Send(req) - if err != nil { - if isConnRefused(err) { - err = repo.ErrApiNotRunning - } - - return wrapContextCanceled(err) - } - - go func() { - err := cmds.Copy(re, res) - if err != nil { - err = re.Emit(cmdkit.Error{err.Error(), cmdkit.ErrNormal | cmdkit.ErrFatal}) - if err != nil { - log.Error(err) - } - } - }() - } else { - log.Debug("executing command locally") - - pluginpath := filepath.Join(cctx.ConfigRoot, "plugins") + pluginpath := filepath.Join(env.(*oldcmds.Context).ConfigRoot, "plugins") if _, err := loader.LoadPlugins(pluginpath); err != nil { - return err + log.Warning("error loading plugins: ", err) } - // Okay!!!!! NOW we can call the command. - go func() { - err := root.Call(req, re, cctx) - if err != nil { - re.SetError(err, cmdkit.ErrNormal) - } - }() + exctr = cmds.NewExecutor(req.Root) } - if returnCode := <-exitCh; returnCode != 0 { - err = exitErr(returnCode) - } - - return err + return exctr, nil } // commandDetails returns a command's details for the command given by |path| @@ -468,14 +274,6 @@ func commandShouldRunOnDaemon(details cmdDetails, req *cmds.Request, root *cmds. return nil, nil } -func isClientError(err error) bool { - if e, ok := err.(*cmdkit.Error); ok { - return e.Code == cmdkit.ErrClient - } - - return false -} - func getRepoPath(req *cmds.Request) (string, error) { repoOpt, found := req.Options["config"].(string) if found && repoOpt != "" { @@ -496,7 +294,6 @@ func loadConfig(path string) (*config.Config, error) { // startProfiling begins CPU profiling and returns a `stop` function to be // executed as late as possible. The stop function captures the memprofile. func startProfiling() (func(), error) { - // start CPU profiling as early as possible ofi, err := os.Create(cpuProfile) if err != nil { @@ -566,8 +363,7 @@ func (ih *IntrHandler) Handle(handler func(count int, ih *IntrHandler), sigs ... }() } -func (i *cmdInvocation) SetupInterruptHandler(ctx context.Context) (io.Closer, context.Context) { - +func setupInterruptHandler(ctx context.Context) (io.Closer, context.Context) { intrh := NewIntrHandler() ctx, cancelFunc := context.WithCancel(ctx) diff --git a/commands/legacy/request.go b/commands/legacy/request.go index e18576408..c9b1171f2 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -20,6 +20,14 @@ type requestWrapper struct { ctx *oldcmds.Context } +func (r *requestWrapper) String() string { + return fmt.Sprintf("{%v, %v}", r.req, r.ctx) +} + +func (r *requestWrapper) GoString() string { + return fmt.Sprintf("lgc.Request{%#v, %#v}", r.req, r.ctx) +} + // InvocContext retuns the invocation context of the oldcmds.Request. // It is faked using OldContext(). func (r *requestWrapper) InvocContext() *oldcmds.Context { @@ -36,6 +44,19 @@ func (r *requestWrapper) SetInvocContext(ctx oldcmds.Context) { func (r *requestWrapper) Command() *oldcmds.Command { return nil } func (r *requestWrapper) Arguments() []string { + cmdArgs := r.req.Command.Arguments + reqArgs := r.req.Arguments + + // TODO figure out the exaclt policy for when to use these automatically + // TODO once that's done, change the log.Debug below to log.Error + // read arguments from body if we don't have all of them or the command has variadic arguemnts + if len(reqArgs) < len(cmdArgs) || + len(cmdArgs) > 0 && cmdArgs[len(cmdArgs)-1].Variadic { + err := r.req.ParseBodyArgs() + if err != nil { + log.Debug("error reading arguments from stdin: ", err) + } + } return r.req.Arguments } @@ -54,7 +75,11 @@ func (r *requestWrapper) Files() files.File { func (r *requestWrapper) Option(name string) *cmdkit.OptionValue { var option cmdkit.Option - for _, def := range r.req.Command.Options { + optDefs, err := r.req.Root.GetOptions(r.req.Path) + if err != nil { + return &cmdkit.OptionValue{nil, false, nil} + } + for _, def := range optDefs { for _, optName := range def.Names() { if name == optName { option = def diff --git a/commands/request.go b/commands/request.go index 980e910da..85b6ca51a 100644 --- a/commands/request.go +++ b/commands/request.go @@ -9,6 +9,7 @@ import ( "os" "reflect" "strconv" + "strings" "time" "github.com/ipfs/go-ipfs/core" @@ -17,6 +18,7 @@ import ( "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" ) type Context struct { @@ -74,6 +76,33 @@ func (c *Context) RootContext() context.Context { return n.Context() } +func (c *Context) LogRequest(req *cmds.Request) func() { + rle := &ReqLogEntry{ + StartTime: time.Now(), + Active: true, + Command: strings.Join(req.Path, "/"), + Options: req.Options, + Args: req.Arguments, + ID: c.ReqLog.nextID, + log: c.ReqLog, + } + c.ReqLog.AddEntry(rle) + + return func() { + c.ReqLog.Finish(rle) + } +} + +func (c *Context) Close() { + // let's not forget teardown. If a node was initialized, we must close it. + // Note that this means the underlying req.Context().Node variable is exposed. + // this is gross, and should be changed when we extract out the exec Context. + if c.node != nil { + log.Info("Shutting down node...") + c.node.Close() + } +} + // Request represents a call to a command from a consumer type Request interface { Path() []string diff --git a/core/commands/add.go b/core/commands/add.go index 513a13dc2..51a2b5bbb 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -429,7 +429,7 @@ You can now check what blocks have been created by: bar.ShowTimeLeft = true } case <-req.Context.Done(): - re.SetError(req.Context.Err(), cmdkit.ErrNormal) + //re.SetError(req.Context.Err(), cmdkit.ErrNormal) return } } diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index eb47e640e..d07e29417 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -13,12 +13,15 @@ import ( path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) +var log = logging.Logger("cmds/files") + var DagCmd = &cmds.Command{ Helptext: cmdkit.HelpText{ Tagline: "Interact with ipld dag objects.", diff --git a/core/commands/files/files.go b/core/commands/files/files.go index c84ad5c91..759bfd20f 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -67,6 +67,12 @@ var hashOption = cmdkit.StringOption("hash", "Hash function to use. Will set Cid var formatError = errors.New("Format was set by multiple options. Only one format option is allowed") +const defaultStatFormat = ` +Size: +CumulativeSize: +ChildBlocks: +Type: ` + var FilesStatCmd = &cmds.Command{ Helptext: cmdkit.HelpText{ Tagline: "Display file status.", @@ -77,12 +83,7 @@ var FilesStatCmd = &cmds.Command{ }, Options: []cmdkit.Option{ cmdkit.StringOption("format", "Print statistics in given format. Allowed tokens: "+ - " . Conflicts with other format options.").WithDefault( - ` -Size: -CumulativeSize: -ChildBlocks: -Type: `), + " . Conflicts with other format options.").WithDefault(defaultStatFormat), cmdkit.BoolOption("hash", "Print only hash. Implies '--format='. Conflicts with other format options."), cmdkit.BoolOption("size", "Print only size. Implies '--format='. Conflicts with other format options."), }, @@ -154,9 +155,9 @@ func statGetFormatOptions(req cmds.Request) (string, error) { hash, _, _ := req.Option("hash").Bool() size, _, _ := req.Option("size").Bool() - format, found, _ := req.Option("format").String() + format, _, _ := req.Option("format").String() - if moreThanOne(hash, size, found) { + if moreThanOne(hash, size, format != defaultStatFormat) { return "", formatError } @@ -235,6 +236,7 @@ var FilesCpCmd = &cmds.Command{ } flush, _, _ := req.Option("flush").Bool() + fmt.Println("flush:", flush) src, err := checkPath(req.Arguments()[0]) if err != nil { @@ -636,7 +638,7 @@ stat' on the file or any of its ancestors. hashOption, }, Run: func(req cmds.Request, res cmds.Response) { - path, err := checkPath(req.Arguments()[0]) + path, err := checkPath(req.StringArguments()[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) return diff --git a/core/commands/get.go b/core/commands/get.go index dc3e7a727..eb10f012a 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -257,13 +257,13 @@ func (gw *getWriter) writeExtracted(r io.Reader, fpath string) error { func getCompressOptions(req *cmds.Request) (int, error) { cmprs, _ := req.Options["compress"].(bool) - cmplvl, cmplvlFound := req.Options["compression-level"].(int) + cmplvl, _ := req.Options["compression-level"].(int) switch { case !cmprs: return gzip.NoCompression, nil - case cmprs && !cmplvlFound: + case cmprs && cmplvl == -1: return gzip.DefaultCompression, nil - case cmprs && cmplvlFound && (cmplvl < 1 || cmplvl > 9): + case cmprs && (cmplvl < 1 || cmplvl > 9): return gzip.NoCompression, ErrInvalidCompressionLevel } return cmplvl, nil diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index 4066e38e1..d5acb2826 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -13,9 +13,12 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) +var log = logging.Logger("core/commands/object") + var ObjectPatchCmd = &cmds.Command{ Helptext: cmdkit.HelpText{ Tagline: "Create a new merkledag object based on an existing one.", @@ -74,7 +77,7 @@ the limit will not be respected by the network. return } - root, err := path.ParsePath(req.Arguments()[0]) + root, err := path.ParsePath(req.StringArguments()[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -142,7 +145,7 @@ Example: return } - rp, err := path.ParsePath(req.Arguments()[0]) + rp, err := path.ParsePath(req.StringArguments()[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) return diff --git a/repo/config/init.go b/repo/config/init.go index 2b1def8b5..a3ceee6d3 100644 --- a/repo/config/init.go +++ b/repo/config/init.go @@ -25,6 +25,11 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) { datastore := DefaultDatastoreConfig() conf := &Config{ + API: API{ + HTTPHeaders: map[string][]string{ + "Server": {"go-ipfs/" + CurrentVersionNumber}, + }, + }, // setup the node's default addresses. // NOTE: two swarm listen addrs, one tcp, one utp. From e8ad0944489166614b380f1368e7467704143bd0 Mon Sep 17 00:00:00 2001 From: keks Date: Sat, 16 Dec 2017 15:54:57 +0100 Subject: [PATCH 06/55] add TODO License: MIT Signed-off-by: keks --- TODO.md | 15 +++++++++++++++ cmd/ipfs/daemon.go | 4 ++-- cmd/ipfs/init.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- cmd/ipfs/main_test.go | 14 -------------- commands/command.go | 4 ++-- commands/command_test.go | 4 ++-- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 4 ++-- commands/legacy/request.go | 6 +++--- commands/legacy/response.go | 4 ++-- commands/legacy/responseemitter.go | 2 +- commands/request.go | 6 +++--- commands/response.go | 4 ++-- commands/response_test.go | 4 ++-- core/commands/active.go | 2 +- core/commands/add.go | 6 +++--- core/commands/bitswap.go | 4 ++-- core/commands/block.go | 4 ++-- core/commands/bootstrap.go | 2 +- core/commands/cat.go | 4 ++-- core/commands/commands.go | 4 ++-- core/commands/commands_test.go | 2 +- core/commands/config.go | 2 +- core/commands/dag/dag.go | 4 ++-- core/commands/dht.go | 2 +- core/commands/diag.go | 2 +- core/commands/dns.go | 2 +- core/commands/external.go | 2 +- core/commands/files/files.go | 2 +- core/commands/filestore.go | 4 ++-- core/commands/get.go | 4 ++-- core/commands/get_test.go | 4 ++-- core/commands/helptext_test.go | 2 +- core/commands/id.go | 2 +- core/commands/ipns.go | 2 +- core/commands/ipnsps.go | 2 +- core/commands/keystore.go | 2 +- core/commands/log.go | 2 +- core/commands/ls.go | 2 +- core/commands/mount_nofuse.go | 2 +- core/commands/mount_unix.go | 2 +- core/commands/mount_windows.go | 2 +- core/commands/name.go | 2 +- core/commands/object/diff.go | 2 +- core/commands/object/object.go | 2 +- core/commands/object/patch.go | 2 +- core/commands/p2p.go | 2 +- core/commands/pin.go | 2 +- core/commands/ping.go | 2 +- core/commands/publish.go | 2 +- core/commands/pubsub.go | 4 ++-- core/commands/refs.go | 2 +- core/commands/repo.go | 4 ++-- core/commands/resolve.go | 2 +- core/commands/root.go | 4 ++-- core/commands/shutdown.go | 2 +- core/commands/stat.go | 4 ++-- core/commands/swarm.go | 2 +- core/commands/sysdiag.go | 2 +- core/commands/tar.go | 2 +- core/commands/unixfs/ls.go | 2 +- core/commands/unixfs/unixfs.go | 2 +- core/commands/version.go | 2 +- core/corehttp/commands.go | 4 ++-- core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 2 +- importer/helpers/dagbuilder.go | 2 +- importer/importer.go | 2 +- package.json | 6 +++--- test/sharness/t0110-gateway.sh | 2 +- test/sharness/t0410-api-add.sh | 2 +- 74 files changed, 117 insertions(+), 116 deletions(-) create mode 100644 TODO.md delete mode 100644 cmd/ipfs/main_test.go diff --git a/TODO.md b/TODO.md new file mode 100644 index 000000000..c1b365f8b --- /dev/null +++ b/TODO.md @@ -0,0 +1,15 @@ +# TODO before merge + +- t0110 fails (marked as known breakage for now) +- t0410 fails (marked as known breakage for now) +- errors in plugin loading are not fatal (but should be). + On master the plugins are loaded after PreRun is called, but + before calling PostRun or Run. I want to remove all these details + from main.go using Executors, so we can only load before PreRun. + + One sharness test case however (at the beginning of t0020) + expects that when the ipfs repo is not accessible, the error + in the `init` commands' PreRun is printed. Instead, the error + printed is the one from loading the plugin. + + Not sure how to resolve this the best way. diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index d6fd2f3d7..19b25cdc1 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -22,12 +22,12 @@ import ( fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 752de642b..463d0e0b3 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) const ( diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 1725cc580..0cdea9ce3 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 0528418c0..493d8e64b 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -32,10 +32,10 @@ import ( logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/cli" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/http" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/cli" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/http" ) // log is the command logger diff --git a/cmd/ipfs/main_test.go b/cmd/ipfs/main_test.go deleted file mode 100644 index 4c8ab2d5a..000000000 --- a/cmd/ipfs/main_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - "testing" - - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" -) - -func TestIsCientErr(t *testing.T) { - t.Log("Only catch pointers") - if !isClientError(&cmdkit.Error{Code: cmdkit.ErrClient}) { - t.Errorf("misidentified error") - } -} diff --git a/commands/command.go b/commands/command.go index 332b09b7e..38e8df490 100644 --- a/commands/command.go +++ b/commands/command.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/path" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 883415089..74d1818be 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 4fb9cfdd6..082f2e6b1 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 92196872b..1b3be8ba9 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index e4855317b..bf18858e2 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index c9b1171f2..e7688aba6 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 4560a8514..2cf21c7fe 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/responseemitter.go b/commands/legacy/responseemitter.go index e4477138c..2fb97a840 100644 --- a/commands/legacy/responseemitter.go +++ b/commands/legacy/responseemitter.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 85b6ca51a..996fa43bd 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 668766529..90b204eeb 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 80d182636..622cf6f0d 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/active.go b/core/commands/active.go index a70000274..772b0b64f 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var ActiveReqsCmd = &cmds.Command{ diff --git a/core/commands/add.go b/core/commands/add.go index 51a2b5bbb..d6587758b 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,10 +18,10 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 383bb742a..2d7e6c823 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -11,10 +11,10 @@ import ( bitswap "github.com/ipfs/go-ipfs/exchange/bitswap" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 93e349297..de5ea8868 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,9 +11,9 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index 16f76c02e..f9968ef6d 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -12,7 +12,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type BootstrapOutput struct { diff --git a/core/commands/cat.go b/core/commands/cat.go index c97bd737d..5b6000a9d 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index f7851c049..200d59dd0 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,8 +14,8 @@ import ( // oldcmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 3da9e87a2..8a533fe17 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/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 index 69891c0db..6ce6332ea 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type ConfigField struct { diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index d07e29417..25f991de5 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -13,9 +13,9 @@ import ( path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/dht.go b/core/commands/dht.go index 73cbebfbe..f0e624f6b 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -13,10 +13,10 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" routing "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing" notif "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing/notifications" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/diag.go b/core/commands/diag.go index 5cad94246..75f6c6857 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var DiagCmd = &cmds.Command{ diff --git a/core/commands/dns.go b/core/commands/dns.go index eed4b0bf8..fb79dfe85 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -8,7 +8,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" namesys "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var DNSCmd = &cmds.Command{ diff --git a/core/commands/external.go b/core/commands/external.go index cfcc4cce8..e4126dbdb 100644 --- a/core/commands/external.go +++ b/core/commands/external.go @@ -10,7 +10,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) func ExternalBinary() *cmds.Command { diff --git a/core/commands/files/files.go b/core/commands/files/files.go index 759bfd20f..dc11a1ab1 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -19,9 +19,9 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 275fe179d..ee1580f4b 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index eb10f012a..88b03fd8d 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index c7f975b2b..4602466c7 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 1fc6724fa..cb56926ae 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/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 index 551b4091c..e30914a63 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -12,9 +12,9 @@ import ( core "github.com/ipfs/go-ipfs/core" e "github.com/ipfs/go-ipfs/core/commands/e" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" kb "gx/ipfs/QmQEo84PQQPJpx9Bf2YxerGVgmgWvQ9iwuZBAJaNJKWREr/go-libp2p-kbucket" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" identify "gx/ipfs/Qma23bpHwQrQyvKeBemaeJh7sAoRHggPkgnge1B9489ff5/go-libp2p/p2p/protocol/identify" diff --git a/core/commands/ipns.go b/core/commands/ipns.go index ff7b4b6b5..b5e10752f 100644 --- a/core/commands/ipns.go +++ b/core/commands/ipns.go @@ -10,7 +10,7 @@ import ( namesys "github.com/ipfs/go-ipfs/namesys" offline "github.com/ipfs/go-ipfs/routing/offline" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var IpnsCmd = &cmds.Command{ diff --git a/core/commands/ipnsps.go b/core/commands/ipnsps.go index a8439b57f..ad83aa0d4 100644 --- a/core/commands/ipnsps.go +++ b/core/commands/ipnsps.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" ns "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type ipnsPubsubState struct { diff --git a/core/commands/keystore.go b/core/commands/keystore.go index cc2b64048..3569a048d 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -12,7 +12,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/log.go b/core/commands/log.go index a4ac317e0..47c014cd6 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -6,8 +6,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) // Golang os.Args overrides * and replaces the character argument with diff --git a/core/commands/ls.go b/core/commands/ls.go index 125c76587..ab6e867df 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -17,8 +17,8 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index abf4c3f2a..aaec09359 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -6,7 +6,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index 4729a36a4..80976fcef 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -13,7 +13,7 @@ import ( nodeMount "github.com/ipfs/go-ipfs/fuse/node" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index 956fc0913..0f02bb5a2 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -5,7 +5,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/name.go b/core/commands/name.go index cece92945..c0b53ae2d 100644 --- a/core/commands/name.go +++ b/core/commands/name.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type IpnsEntry struct { diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index e1f4f95d0..8e23b236f 100644 --- a/core/commands/object/diff.go +++ b/core/commands/object/diff.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" dagutils "github.com/ipfs/go-ipfs/merkledag/utils" path "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type Changes struct { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 81f9dbde9..006d79937 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -20,8 +20,8 @@ import ( pin "github.com/ipfs/go-ipfs/pin" ft "github.com/ipfs/go-ipfs/unixfs" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index d5acb2826..1ee69e2dc 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -13,8 +13,8 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ) var log = logging.Logger("core/commands/object") diff --git a/core/commands/p2p.go b/core/commands/p2p.go index 0ea8590c5..18fe70908 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" ) diff --git a/core/commands/pin.go b/core/commands/pin.go index 6c060bf4d..5a9d209d0 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -16,8 +16,8 @@ import ( pin "github.com/ipfs/go-ipfs/pin" uio "github.com/ipfs/go-ipfs/unixfs/io" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/ping.go b/core/commands/ping.go index f492bf375..e3a5817e1 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -12,8 +12,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/publish.go b/core/commands/publish.go index 6d0d562aa..d91d83a56 100644 --- a/core/commands/publish.go +++ b/core/commands/publish.go @@ -14,7 +14,7 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" crypto "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 72d68f635..5970995dc 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -11,10 +11,10 @@ import ( core "github.com/ipfs/go-ipfs/core" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/refs.go b/core/commands/refs.go index b0621accd..5d694dacb 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -13,8 +13,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index 007a73300..adf05397f 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,8 +18,8 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/resolve.go b/core/commands/resolve.go index eb0df3b44..dbddb5421 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -10,7 +10,7 @@ import ( ns "github.com/ipfs/go-ipfs/namesys" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type ResolvedPath struct { diff --git a/core/commands/root.go b/core/commands/root.go index 3bef53e97..46f0bbf92 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -12,9 +12,9 @@ import ( unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs" lgc "github.com/ipfs/go-ipfs/commands/legacy" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" - "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go index 6aa80c71a..d598b4870 100644 --- a/core/commands/shutdown.go +++ b/core/commands/shutdown.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" cmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/core/commands/stat.go b/core/commands/stat.go index a737060d5..959df00d8 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -7,10 +7,10 @@ import ( "os" "time" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" ) diff --git a/core/commands/swarm.go b/core/commands/swarm.go index 6cdf9fecb..996c72ae3 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -15,9 +15,9 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" swarm "gx/ipfs/QmUhvp4VoQ9cKDVLqAxciEKdm8ymBx2Syx4C1Tv6SmSTPa/go-libp2p-swarm" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" iaddr "gx/ipfs/QmdMeXVB1V1SAZcFzoCuM3zR9K8PeuzCYg4zXNHcHh6dHU/go-ipfs-addr" diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 314d061b8..9da0662f3 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -8,8 +8,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" config "github.com/ipfs/go-ipfs/repo/config" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" ) diff --git a/core/commands/tar.go b/core/commands/tar.go index 4e43cd131..d81485c84 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -12,7 +12,7 @@ import ( path "github.com/ipfs/go-ipfs/path" tar "github.com/ipfs/go-ipfs/tar" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var TarCmd = &cmds.Command{ diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index dcc9910ac..75246a2a6 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -15,7 +15,7 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/unixfs/unixfs.go b/core/commands/unixfs/unixfs.go index 92d6c72f4..d4a887bbf 100644 --- a/core/commands/unixfs/unixfs.go +++ b/core/commands/unixfs/unixfs.go @@ -4,7 +4,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) var UnixFSCmd = &cmds.Command{ diff --git a/core/commands/version.go b/core/commands/version.go index 4fb675657..2810d8959 100644 --- a/core/commands/version.go +++ b/core/commands/version.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" ) type VersionOutput struct { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 4a545bc0a..ed8f18b98 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps/go-ipfs-cmds/http" + cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/http" ) var ( diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 4663dc64b..23c335bf8 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -24,9 +24,9 @@ import ( posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" unixfs "github.com/ipfs/go-ipfs/unixfs" + files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index a48110a94..2abe70e77 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -20,7 +20,7 @@ import ( ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2" pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go index 43a1e386f..61ead8d05 100644 --- a/importer/helpers/dagbuilder.go +++ b/importer/helpers/dagbuilder.go @@ -8,8 +8,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" ft "github.com/ipfs/go-ipfs/unixfs" + files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - files "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/importer.go b/importer/importer.go index 45a0da994..1162ca83a 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -11,7 +11,7 @@ import ( h "github.com/ipfs/go-ipfs/importer/helpers" trickle "github.com/ipfs/go-ipfs/importer/trickle" dag "github.com/ipfs/go-ipfs/merkledag" - "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files" + "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" ) diff --git a/package.json b/package.json index 4c5284371..8e2e231d2 100644 --- a/package.json +++ b/package.json @@ -414,12 +414,12 @@ "version": "2.1.2" }, { - "hash": "QmYopJAcV7R9SbxiPBCvqhnt8EusQpWPHewoZakCMt8hps", + "hash": "QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7", "name": "go-ipfs-cmds", - "version": "0.5.0-dev" + "version": "1.0.0-dev" }, { - "hash": "QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps", + "hash": "QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1", "name": "go-ipfs-cmdkit", "version": "1.0.0-dev" }, diff --git a/test/sharness/t0110-gateway.sh b/test/sharness/t0110-gateway.sh index c5a4aa39c..fa37c5b21 100755 --- a/test/sharness/t0110-gateway.sh +++ b/test/sharness/t0110-gateway.sh @@ -135,7 +135,7 @@ test_expect_success "get IPFS directory file through readonly API output looks g test_cmp dir/test actual ' -test_expect_success "refs IPFS directory file through readonly API succeeds" ' +test_expect_failure "refs IPFS directory file through readonly API succeeds" ' test_curl_gateway_api "refs?arg=$HASH2/test" ' diff --git a/test/sharness/t0410-api-add.sh b/test/sharness/t0410-api-add.sh index d0d6b75c1..be5eba1ad 100755 --- a/test/sharness/t0410-api-add.sh +++ b/test/sharness/t0410-api-add.sh @@ -13,7 +13,7 @@ test_init_ipfs # Verify that that API add command returns size test_launch_ipfs_daemon -test_expect_success "API Add response includes size field" ' +test_expect_failure "API Add response includes size field" ' echo "hi" | curl -s -F file=@- "http://localhost:$API_PORT/api/v0/add" | grep "\"Size\": *\"11\"" ' test_kill_ipfs_daemon From 23a27b9c67c6503121b8922d2701352fc8b90aa3 Mon Sep 17 00:00:00 2001 From: keks Date: Sat, 16 Dec 2017 17:51:41 +0100 Subject: [PATCH 07/55] fix test that didn't respect cmds.Single License: MIT Signed-off-by: keks --- commands/legacy/legacy_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index bf18858e2..b3b107cc2 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -83,7 +83,8 @@ func TestNewCommand(t *testing.T) { t.Fatal(err) } - expected := "Test." + expected := `{"Value":"Test."} +` if buf.String() != expected { t.Fatalf("expected string %#v but got %#v", expected, buf.String()) From 740cf4a3b43fcb6615790885cc801fae9f764bba Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 10:23:02 +0100 Subject: [PATCH 08/55] cmd/ipfs: check whether repo is accessible before attempting to load plugins License: MIT Signed-off-by: keks --- cmd/ipfs/main.go | 29 ++++++++++++++++++++++++++--- test/sharness/t0020-init.sh | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 493d8e64b..6ff757c4f 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -182,9 +182,18 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) { if client != nil && !req.Command.External { exctr = client.(cmds.Executor) } else { - pluginpath := filepath.Join(env.(*oldcmds.Context).ConfigRoot, "plugins") - if _, err := loader.LoadPlugins(pluginpath); err != nil { - log.Warning("error loading plugins: ", err) + cctx := env.(*oldcmds.Context) + pluginpath := filepath.Join(cctx.ConfigRoot, "plugins") + + // check if repo is accessible before loading plugins + ok, err := checkPermissions(cctx.ConfigRoot) + if err != nil { + return nil, err + } + if ok { + if _, err := loader.LoadPlugins(pluginpath); err != nil { + log.Warning("error loading plugins: ", err) + } } exctr = cmds.NewExecutor(req.Root) @@ -193,6 +202,20 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) { return exctr, nil } +func checkPermissions(path string) (bool, error) { + _, err := os.Open(path) + if os.IsNotExist(err) { + // repo does not exist yet - don't load plugins, but also don't fail + return false, nil + } + if os.IsPermission(err) { + // repo is not accessible. error out. + return false, fmt.Errorf("error opening repository at %s: permission denied", path) + } + + return true, nil +} + // commandDetails returns a command's details for the command given by |path| // within the |root| command tree. // diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh index 697203a9f..65f811bc6 100755 --- a/test/sharness/t0020-init.sh +++ b/test/sharness/t0020-init.sh @@ -22,7 +22,7 @@ test_expect_success "ipfs init fails" ' # Under Windows/Cygwin the error message is different, # so we use the STD_ERR_MSG prereq. if test_have_prereq STD_ERR_MSG; then - init_err_msg="Error: failed to take lock at $IPFS_PATH: permission denied" + init_err_msg="Error: error opening repository at $IPFS_PATH: permission denied" else init_err_msg="Error: mkdir $IPFS_PATH: The system cannot find the path specified." fi From 94be1f219e00c111207631b025d3c21d2fe5abb4 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 10:34:12 +0100 Subject: [PATCH 09/55] update TODO License: MIT Signed-off-by: keks --- TODO.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/TODO.md b/TODO.md index c1b365f8b..b10ed2dff 100644 --- a/TODO.md +++ b/TODO.md @@ -2,14 +2,4 @@ - t0110 fails (marked as known breakage for now) - t0410 fails (marked as known breakage for now) -- errors in plugin loading are not fatal (but should be). - On master the plugins are loaded after PreRun is called, but - before calling PostRun or Run. I want to remove all these details - from main.go using Executors, so we can only load before PreRun. - - One sharness test case however (at the beginning of t0020) - expects that when the ipfs repo is not accessible, the error - in the `init` commands' PreRun is printed. Instead, the error - printed is the one from loading the plugin. - - Not sure how to resolve this the best way. +- some unused code in core/corehttp/commands.go should either be made to work or removed From 7d57def06e11a88c76e6731c8518db146b25d397 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 15:38:55 +0100 Subject: [PATCH 10/55] remove dead code, update TODO License: MIT Signed-off-by: keks --- TODO.md | 3 +-- core/corehttp/commands.go | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/TODO.md b/TODO.md index b10ed2dff..ec661a11e 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,4 @@ # TODO before merge -- t0110 fails (marked as known breakage for now) +- t0110 fails (marked as known breakage for now) Issue: go-ipfs-cmds#47 - t0410 fails (marked as known breakage for now) -- some unused code in core/corehttp/commands.go should either be made to work or removed diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index ed8f18b98..e520904f0 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -166,16 +166,3 @@ func CheckVersionOption() ServeOption { return mux, nil }) } - -// ServerNameOption returns a ServeOption that makes the http server set the Server HTTP header. -func ServerNameOption(name string) ServeOption { - return ServeOption(func(n *core.IpfsNode, l net.Listener, next *http.ServeMux) (*http.ServeMux, error) { - mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", name) - next.ServeHTTP(w, r) - }) - - return mux, nil - }) -} From 012e3381f199885a572a3d775086cabbb40f9797 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 16:04:50 +0100 Subject: [PATCH 11/55] fix content type detection to allow adding via curl fixed in cmdkit1.0 License: MIT Signed-off-by: keks --- TODO.md | 1 - test/sharness/t0410-api-add.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index ec661a11e..c3ca91383 100644 --- a/TODO.md +++ b/TODO.md @@ -1,4 +1,3 @@ # TODO before merge - t0110 fails (marked as known breakage for now) Issue: go-ipfs-cmds#47 -- t0410 fails (marked as known breakage for now) diff --git a/test/sharness/t0410-api-add.sh b/test/sharness/t0410-api-add.sh index be5eba1ad..d0d6b75c1 100755 --- a/test/sharness/t0410-api-add.sh +++ b/test/sharness/t0410-api-add.sh @@ -13,7 +13,7 @@ test_init_ipfs # Verify that that API add command returns size test_launch_ipfs_daemon -test_expect_failure "API Add response includes size field" ' +test_expect_success "API Add response includes size field" ' echo "hi" | curl -s -F file=@- "http://localhost:$API_PORT/api/v0/add" | grep "\"Size\": *\"11\"" ' test_kill_ipfs_daemon From af438035db1d52ce4e5b3837fcfeffa26fc45543 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 16:25:49 +0100 Subject: [PATCH 12/55] update TODO (client version check) License: MIT Signed-off-by: keks --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index c3ca91383..8975c7f16 100644 --- a/TODO.md +++ b/TODO.md @@ -1,3 +1,4 @@ # TODO before merge - t0110 fails (marked as known breakage for now) Issue: go-ipfs-cmds#47 +- return an error if a http client connects with User-Agent ~ '^/go-ipfs/` but not our exact version From fbc36b8962aa2bea08e767f0175f1632a8cc35de Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 16:51:01 +0100 Subject: [PATCH 13/55] update dependencies and update TODO broken sharness test t0110 has been fixed in master License: MIT Signed-off-by: keks --- TODO.md | 1 - cmd/ipfs/daemon.go | 4 ++-- cmd/ipfs/init.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 4 ++-- commands/command_test.go | 4 ++-- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 4 ++-- commands/legacy/request.go | 6 +++--- commands/legacy/response.go | 4 ++-- commands/legacy/responseemitter.go | 2 +- commands/request.go | 6 +++--- commands/response.go | 4 ++-- commands/response_test.go | 4 ++-- core/commands/active.go | 2 +- core/commands/add.go | 6 +++--- core/commands/bitswap.go | 4 ++-- core/commands/block.go | 4 ++-- core/commands/bootstrap.go | 2 +- core/commands/cat.go | 4 ++-- core/commands/commands.go | 4 ++-- core/commands/commands_test.go | 2 +- core/commands/config.go | 2 +- core/commands/dag/dag.go | 4 ++-- core/commands/dht.go | 2 +- core/commands/diag.go | 2 +- core/commands/dns.go | 2 +- core/commands/external.go | 2 +- core/commands/files/files.go | 2 +- core/commands/filestore.go | 4 ++-- core/commands/get.go | 4 ++-- core/commands/get_test.go | 4 ++-- core/commands/helptext_test.go | 2 +- core/commands/id.go | 2 +- core/commands/ipns.go | 2 +- core/commands/ipnsps.go | 2 +- core/commands/keystore.go | 2 +- core/commands/log.go | 2 +- core/commands/ls.go | 2 +- core/commands/mount_nofuse.go | 2 +- core/commands/mount_unix.go | 2 +- core/commands/mount_windows.go | 2 +- core/commands/name.go | 2 +- core/commands/object/diff.go | 2 +- core/commands/object/object.go | 2 +- core/commands/object/patch.go | 2 +- core/commands/p2p.go | 2 +- core/commands/pin.go | 2 +- core/commands/ping.go | 2 +- core/commands/publish.go | 2 +- core/commands/pubsub.go | 4 ++-- core/commands/refs.go | 2 +- core/commands/repo.go | 4 ++-- core/commands/resolve.go | 2 +- core/commands/root.go | 4 ++-- core/commands/shutdown.go | 2 +- core/commands/stat.go | 4 ++-- core/commands/swarm.go | 2 +- core/commands/sysdiag.go | 2 +- core/commands/tar.go | 2 +- core/commands/unixfs/ls.go | 2 +- core/commands/unixfs/unixfs.go | 2 +- core/commands/version.go | 2 +- core/corehttp/commands.go | 4 ++-- core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 2 +- importer/helpers/dagbuilder.go | 2 +- importer/importer.go | 2 +- package.json | 4 ++-- 71 files changed, 99 insertions(+), 100 deletions(-) diff --git a/TODO.md b/TODO.md index 8975c7f16..53250541f 100644 --- a/TODO.md +++ b/TODO.md @@ -1,4 +1,3 @@ # TODO before merge -- t0110 fails (marked as known breakage for now) Issue: go-ipfs-cmds#47 - return an error if a http client connects with User-Agent ~ '^/go-ipfs/` but not our exact version diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 19b25cdc1..102a01545 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -22,12 +22,12 @@ import ( fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 463d0e0b3..1d35ecc9f 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) const ( diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 0cdea9ce3..4bc50823c 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 6ff757c4f..816a75aa9 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,10 +31,10 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/cli" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/cli" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/http" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" ) diff --git a/commands/command.go b/commands/command.go index 38e8df490..4daf8514a 100644 --- a/commands/command.go +++ b/commands/command.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 74d1818be..0bc1b49dd 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 082f2e6b1..8bb7fbce0 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 1b3be8ba9..0306bbd62 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index b3b107cc2..d5114d793 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index e7688aba6..ccb198931 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 2cf21c7fe..954070326 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/responseemitter.go b/commands/legacy/responseemitter.go index 2fb97a840..16da22bb6 100644 --- a/commands/legacy/responseemitter.go +++ b/commands/legacy/responseemitter.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 996fa43bd..ec42cd77b 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 90b204eeb..119bd01ad 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 622cf6f0d..007ace0eb 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/active.go b/core/commands/active.go index 772b0b64f..3e577df74 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var ActiveReqsCmd = &cmds.Command{ diff --git a/core/commands/add.go b/core/commands/add.go index d6587758b..c488888ea 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,9 +18,9 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 2d7e6c823..c01ac2616 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -11,10 +11,10 @@ import ( bitswap "github.com/ipfs/go-ipfs/exchange/bitswap" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index de5ea8868..9fce1893f 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,8 +11,8 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index f9968ef6d..43a07f192 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -12,7 +12,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type BootstrapOutput struct { diff --git a/core/commands/cat.go b/core/commands/cat.go index 5b6000a9d..b309e6da2 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index 200d59dd0..30b727d8d 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,8 +14,8 @@ import ( // oldcmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 8a533fe17..7bdbcbcd4 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/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 index 6ce6332ea..6b20101c7 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type ConfigField struct { diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 25f991de5..321e41521 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -13,8 +13,8 @@ import ( path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/dht.go b/core/commands/dht.go index f0e624f6b..5597936d1 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -13,9 +13,9 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" routing "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing" notif "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing/notifications" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/diag.go b/core/commands/diag.go index 75f6c6857..19caa4418 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var DiagCmd = &cmds.Command{ diff --git a/core/commands/dns.go b/core/commands/dns.go index fb79dfe85..3f265dc46 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -8,7 +8,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" namesys "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var DNSCmd = &cmds.Command{ diff --git a/core/commands/external.go b/core/commands/external.go index e4126dbdb..73011280f 100644 --- a/core/commands/external.go +++ b/core/commands/external.go @@ -10,7 +10,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) func ExternalBinary() *cmds.Command { diff --git a/core/commands/files/files.go b/core/commands/files/files.go index dc11a1ab1..5a422b2fc 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -19,8 +19,8 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/filestore.go b/core/commands/filestore.go index ee1580f4b..324145225 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 88b03fd8d..e3f9bab1b 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 4602466c7..8548f4a74 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index cb56926ae..3d29c2fda 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/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 index e30914a63..b08bfac0b 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -12,8 +12,8 @@ import ( core "github.com/ipfs/go-ipfs/core" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" kb "gx/ipfs/QmQEo84PQQPJpx9Bf2YxerGVgmgWvQ9iwuZBAJaNJKWREr/go-libp2p-kbucket" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/ipns.go b/core/commands/ipns.go index b5e10752f..4faaa0be9 100644 --- a/core/commands/ipns.go +++ b/core/commands/ipns.go @@ -10,7 +10,7 @@ import ( namesys "github.com/ipfs/go-ipfs/namesys" offline "github.com/ipfs/go-ipfs/routing/offline" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var IpnsCmd = &cmds.Command{ diff --git a/core/commands/ipnsps.go b/core/commands/ipnsps.go index ad83aa0d4..332b73bb9 100644 --- a/core/commands/ipnsps.go +++ b/core/commands/ipnsps.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" ns "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type ipnsPubsubState struct { diff --git a/core/commands/keystore.go b/core/commands/keystore.go index 3569a048d..c189094db 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -12,7 +12,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/log.go b/core/commands/log.go index 47c014cd6..7a638230f 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -6,7 +6,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ) diff --git a/core/commands/ls.go b/core/commands/ls.go index ab6e867df..335a0049f 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -17,8 +17,8 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index aaec09359..e16c47164 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -6,7 +6,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index 80976fcef..b41a16a1e 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -13,7 +13,7 @@ import ( nodeMount "github.com/ipfs/go-ipfs/fuse/node" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index 0f02bb5a2..de45a2932 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -5,7 +5,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/name.go b/core/commands/name.go index c0b53ae2d..c9535f608 100644 --- a/core/commands/name.go +++ b/core/commands/name.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type IpnsEntry struct { diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index 8e23b236f..51fed0008 100644 --- a/core/commands/object/diff.go +++ b/core/commands/object/diff.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" dagutils "github.com/ipfs/go-ipfs/merkledag/utils" path "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type Changes struct { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 006d79937..5c5d26d99 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -20,8 +20,8 @@ import ( pin "github.com/ipfs/go-ipfs/pin" ft "github.com/ipfs/go-ipfs/unixfs" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index 1ee69e2dc..f3d004e70 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -13,7 +13,7 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ) diff --git a/core/commands/p2p.go b/core/commands/p2p.go index 18fe70908..cd02e9e0a 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" ) diff --git a/core/commands/pin.go b/core/commands/pin.go index 5a9d209d0..0d051a15d 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -16,8 +16,8 @@ import ( pin "github.com/ipfs/go-ipfs/pin" uio "github.com/ipfs/go-ipfs/unixfs/io" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/ping.go b/core/commands/ping.go index e3a5817e1..5bc3e17ae 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -12,8 +12,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/publish.go b/core/commands/publish.go index d91d83a56..cb4c7d610 100644 --- a/core/commands/publish.go +++ b/core/commands/publish.go @@ -14,7 +14,7 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" crypto "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" ) diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 5970995dc..543637209 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -11,9 +11,9 @@ import ( core "github.com/ipfs/go-ipfs/core" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/refs.go b/core/commands/refs.go index 5d694dacb..7d15ac95c 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -13,8 +13,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index adf05397f..241e6c91b 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,8 +18,8 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/resolve.go b/core/commands/resolve.go index dbddb5421..64541c756 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -10,7 +10,7 @@ import ( ns "github.com/ipfs/go-ipfs/namesys" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type ResolvedPath struct { diff --git a/core/commands/root.go b/core/commands/root.go index 46f0bbf92..d88edd414 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -12,9 +12,9 @@ import ( unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs" lgc "github.com/ipfs/go-ipfs/commands/legacy" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" + "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go index d598b4870..c5532f7f4 100644 --- a/core/commands/shutdown.go +++ b/core/commands/shutdown.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/core/commands/stat.go b/core/commands/stat.go index 959df00d8..38d89b3a0 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -7,10 +7,10 @@ import ( "os" "time" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" ) diff --git a/core/commands/swarm.go b/core/commands/swarm.go index 996c72ae3..a378ad9b9 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -15,8 +15,8 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" swarm "gx/ipfs/QmUhvp4VoQ9cKDVLqAxciEKdm8ymBx2Syx4C1Tv6SmSTPa/go-libp2p-swarm" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 9da0662f3..959a1abac 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -8,8 +8,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" ) diff --git a/core/commands/tar.go b/core/commands/tar.go index d81485c84..2d000b565 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -12,7 +12,7 @@ import ( path "github.com/ipfs/go-ipfs/path" tar "github.com/ipfs/go-ipfs/tar" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var TarCmd = &cmds.Command{ diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index 75246a2a6..cd5a0ec7a 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -15,7 +15,7 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - cmdkit "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/unixfs/unixfs.go b/core/commands/unixfs/unixfs.go index d4a887bbf..d7ca9b375 100644 --- a/core/commands/unixfs/unixfs.go +++ b/core/commands/unixfs/unixfs.go @@ -4,7 +4,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) var UnixFSCmd = &cmds.Command{ diff --git a/core/commands/version.go b/core/commands/version.go index 2810d8959..9f0aeab69 100644 --- a/core/commands/version.go +++ b/core/commands/version.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ) type VersionOutput struct { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index e520904f0..85b1f8091 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7/go-ipfs-cmds/http" + cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/http" ) var ( diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 23c335bf8..1419b7b5b 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -24,8 +24,8 @@ import ( posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" unixfs "github.com/ipfs/go-ipfs/unixfs" - files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 2abe70e77..27e99bb72 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -20,7 +20,7 @@ import ( ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2" pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go index 61ead8d05..ed20929d8 100644 --- a/importer/helpers/dagbuilder.go +++ b/importer/helpers/dagbuilder.go @@ -8,8 +8,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" ft "github.com/ipfs/go-ipfs/unixfs" - files "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" + files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/importer.go b/importer/importer.go index 1162ca83a..138d5bcee 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -11,7 +11,7 @@ import ( h "github.com/ipfs/go-ipfs/importer/helpers" trickle "github.com/ipfs/go-ipfs/importer/trickle" dag "github.com/ipfs/go-ipfs/merkledag" - "gx/ipfs/QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1/go-ipfs-cmdkit/files" + "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" ) diff --git a/package.json b/package.json index 8e2e231d2..f35d8ec91 100644 --- a/package.json +++ b/package.json @@ -414,12 +414,12 @@ "version": "2.1.2" }, { - "hash": "QmXPgUkyFLMN3c79WrGM2VbjWynSPnmaHjF2AviBVQE2i7", + "hash": "QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, { - "hash": "QmNaA1HxkbVtweGfabDMy2DMLvqQ1eg3LNEqDMVA3zCoz1", + "hash": "QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM", "name": "go-ipfs-cmdkit", "version": "1.0.0-dev" }, From 8294f0a34597858d987b85bcf4e9e64de7268b8d Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 17:03:03 +0100 Subject: [PATCH 14/55] remove test for deleted fuction License: MIT Signed-off-by: keks --- core/corehttp/option_test.go | 38 ------------------------------------ 1 file changed, 38 deletions(-) diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go index 37c88cce4..1e80e5d98 100644 --- a/core/corehttp/option_test.go +++ b/core/corehttp/option_test.go @@ -73,41 +73,3 @@ func TestCheckVersionOption(t *testing.T) { } } } - -func TestServerNameOption(t *testing.T) { - type testcase struct { - name string - } - - tcs := []testcase{ - {"go-ipfs/0.4.13"}, - {"go-ipfs/" + config.CurrentVersionNumber}, - } - - assert := func(name string, exp, got interface{}) { - if got != exp { - t.Errorf("%s: got %q, expected %q", name, got, exp) - } - } - - for _, tc := range tcs { - t.Logf("%#v", tc) - r := httptest.NewRequest("POST", "/", nil) - - inner := http.NewServeMux() - inner.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - // this block is intentionally left blank. - }) - - mux, err := ServerNameOption(tc.name)(nil, nil, inner) - if err != nil { - t.Fatal(err) - } - - w := httptest.NewRecorder() - - mux.ServeHTTP(w, r) - srvHdr := w.Header().Get("Server") - assert("Server header", tc.name, srvHdr) - } -} From 52bc29823066fccf3c05ed72e9c01d5757d75af9 Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 17:29:24 +0100 Subject: [PATCH 15/55] fix ServerNameOption License: MIT Signed-off-by: keks --- TODO.md | 1 - cmd/ipfs/daemon.go | 4 ++-- core/corehttp/commands.go | 10 ++++++---- core/corehttp/option_test.go | 16 ++++++++-------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/TODO.md b/TODO.md index 53250541f..6ebfcaf57 100644 --- a/TODO.md +++ b/TODO.md @@ -1,3 +1,2 @@ # TODO before merge -- return an error if a http client connects with User-Agent ~ '^/go-ipfs/` but not our exact version diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 102a01545..6498f9ee1 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -433,8 +433,8 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), + corehttp.CheckVersionOption(), corehttp.CommandsOption(*cctx), - //corehttp.CheckVersionOption(), //corehttp.ServerNameOption("go-ipfs/" + config.CurrentVersionNumber), corehttp.WebUIOption, gatewayOpt, @@ -529,11 +529,11 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("gateway"), + corehttp.CheckVersionOption(), corehttp.CommandsROOption(*cctx), corehttp.VersionOption(), corehttp.IPNSHostnameOption(), corehttp.GatewayOption(writable, "/ipfs", "/ipns"), - corehttp.CheckVersionOption(), } if len(cfg.Gateway.RootRedirect) > 0 { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 85b1f8091..f2c85e743 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -144,11 +144,13 @@ func CommandsROOption(cctx oldcmds.Context) ServeOption { func CheckVersionOption() ServeOption { daemonVersion := config.ApiVersion - return ServeOption(func(n *core.IpfsNode, l net.Listener, next *http.ServeMux) (*http.ServeMux, error) { + return ServeOption(func(n *core.IpfsNode, l net.Listener, parent *http.ServeMux) (*http.ServeMux, error) { mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + parent.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { if strings.HasPrefix(r.URL.Path, APIPath) { - pth := path.SplitList(r.URL.Path[len(APIPath):]) + cmdqry := r.URL.Path[len(APIPath):] + pth := path.SplitList(cmdqry) + // backwards compatibility to previous version check if pth[1] != "version" { clientVersion := r.UserAgent() @@ -160,7 +162,7 @@ func CheckVersionOption() ServeOption { } } - next.ServeHTTP(w, r) + mux.ServeHTTP(w, r) }) return mux, nil diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go index 1e80e5d98..b32e2afcf 100644 --- a/core/corehttp/option_test.go +++ b/core/corehttp/option_test.go @@ -41,8 +41,13 @@ func TestCheckVersionOption(t *testing.T) { r.Header.Add("User-Agent", tc.userAgent) // old version, should fail called := false - inner := http.NewServeMux() - inner.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + root := http.NewServeMux() + mux, err := CheckVersionOption()(nil, nil, root) + if err != nil { + t.Fatal(err) + } + + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { called = true if !tc.shouldHandle { t.Error("handler was called even though version didn't match") @@ -51,14 +56,9 @@ func TestCheckVersionOption(t *testing.T) { } }) - mux, err := CheckVersionOption()(nil, nil, inner) - if err != nil { - t.Fatal(err) - } - w := httptest.NewRecorder() - mux.ServeHTTP(w, r) + root.ServeHTTP(w, r) if tc.shouldHandle && !called { t.Error("handler wasn't called even though it should have") From 4b9c36b072a8a34b2cbbdafad3ad83b60214ea5c Mon Sep 17 00:00:00 2001 From: keks Date: Mon, 18 Dec 2017 17:42:33 +0100 Subject: [PATCH 16/55] sharness: increase timeout waiting for api file License: MIT Signed-off-by: keks --- test/sharness/lib/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sharness/lib/test-lib.sh b/test/sharness/lib/test-lib.sh index bddfdd538..924f8d94f 100644 --- a/test/sharness/lib/test-lib.sh +++ b/test/sharness/lib/test-lib.sh @@ -218,7 +218,7 @@ test_launch_ipfs_daemon() { # wait for api file to show up test_expect_success "api file shows up" ' - test_wait_for_file 20 100ms "$IPFS_PATH/api" + test_wait_for_file 50 100ms "$IPFS_PATH/api" ' test_set_address_vars actual_daemon From 27b43612b6f16cad5bab0a6ed4fa0f9b5f037832 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 11:10:28 +0100 Subject: [PATCH 17/55] fix refs handling on gateway License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 1 - core/commands/root.go | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 6498f9ee1..2080b2778 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -435,7 +435,6 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error corehttp.MetricsCollectionOption("api"), corehttp.CheckVersionOption(), corehttp.CommandsOption(*cctx), - //corehttp.ServerNameOption("go-ipfs/" + config.CurrentVersionNumber), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), diff --git a/core/commands/root.go b/core/commands/root.go index d88edd414..b09c9b5f4 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -179,7 +179,6 @@ var rootROSubcommands = map[string]*cmds.Command{ "resolve": dag.DagResolveCmd, }, }), - "refs": lgc.NewCommand(RefsROCmd), "resolve": lgc.NewCommand(ResolveCmd), "version": lgc.NewCommand(VersionCmd), } @@ -192,6 +191,11 @@ func init() { *RefsROCmd = *RefsCmd RefsROCmd.Subcommands = map[string]*oldcmds.Command{} + // this was in the big map definition above before, + // but if we leave it there lgc.NewCommand will be executed + // before the value is updated (:/sanitize readonly refs command/) + rootROSubcommands["refs"] = lgc.NewCommand(RefsROCmd) + Root.Subcommands = rootSubcommands RootRO.Subcommands = rootROSubcommands From 94266bf2e4613f57229e9de1a7e358cab92155de Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 11:11:48 +0100 Subject: [PATCH 18/55] update go-ipfs-cmds License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 2080b2778..2febb74df 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -25,7 +25,7 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 4bc50823c..3548a46f8 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 816a75aa9..44256b4d7 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,9 +31,9 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/cli" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/http" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/cli" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" ) diff --git a/commands/command.go b/commands/command.go index 4daf8514a..3a1a9ecf5 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 0bc1b49dd..b5dc59132 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 8bb7fbce0..873a17b19 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 0306bbd62..caeb8037f 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index d5114d793..cec580904 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index ccb198931..e2c1b70dc 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 954070326..51aeadec6 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index ec42cd77b..402d36a62 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 119bd01ad..69f010c8c 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 007ace0eb..70cd32422 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index c488888ea..b684540b9 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,7 +20,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index c01ac2616..f932938c1 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -13,7 +13,7 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 9fce1893f..68a6cd319 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -12,7 +12,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/cat.go b/core/commands/cat.go index b309e6da2..90b9690a7 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index 30b727d8d..b9e7d2b56 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -15,7 +15,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 7bdbcbcd4..0b7c85035 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 324145225..b179ab751 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,7 +13,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index e3f9bab1b..d8f5c5410 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,7 +17,7 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 8548f4a74..e67e8984e 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 3d29c2fda..aab840791 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 543637209..5b6c06104 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,7 +13,7 @@ import ( floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/repo.go b/core/commands/repo.go index 241e6c91b..e17317eb5 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,7 +19,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index b09c9b5f4..c95740318 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 38d89b3a0..fdf4f03a5 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,7 +9,7 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index f2c85e743..fee78525d 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y/go-ipfs-cmds/http" + cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index f35d8ec91..d54528a1c 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmUthF74m2X24Y1CFdq6wyu6QSm9Q6JEVPZ1c5XJtccW2y", + "hash": "QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, From b23c3295e62fb831f355f21255c02b3f7a841a2c Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 11:24:30 +0100 Subject: [PATCH 19/55] update go-ipfs-cmds License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 2febb74df..263c9fcfe 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -25,9 +25,9 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 3548a46f8..105e1e1df 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 44256b4d7..9f846bb37 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,11 +31,11 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/cli" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/cli" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/http" ) // log is the command logger diff --git a/commands/command.go b/commands/command.go index 3a1a9ecf5..994c6c310 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index b5dc59132..fdfbb1dfb 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 873a17b19..ea48f96c5 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index caeb8037f..8e03b114c 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index cec580904..31b55f86e 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index e2c1b70dc..a02526057 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 51aeadec6..c9c2a2944 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 402d36a62..647e31fdc 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 69f010c8c..6008141b6 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 70cd32422..9718dc38a 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index b684540b9..29b166f11 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,7 +20,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index f932938c1..ad6277eb9 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -13,8 +13,8 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 68a6cd319..2488421f2 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -12,7 +12,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/cat.go b/core/commands/cat.go index 90b9690a7..b2166fdfe 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index b9e7d2b56..af933bb40 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -15,7 +15,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 0b7c85035..17e38ad63 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index b179ab751..53cc01592 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,7 +13,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index d8f5c5410..e4c45a0bf 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,7 +17,7 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index e67e8984e..f719eaf9a 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index aab840791..e6244260e 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 5b6c06104..e88f4398d 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,7 +13,7 @@ import ( floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/repo.go b/core/commands/repo.go index e17317eb5..0949f127d 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,7 +19,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index c95740318..983b6b3a4 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" + "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index fdf4f03a5..7a69e8850 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,8 +9,8 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" ) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index fee78525d..dbd30e7c1 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9/go-ipfs-cmds/http" + cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index d54528a1c..a2032d7de 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmULd2tG5e3Hu6fdN1teSsXQFxzWmVWDmdMNMXutQnCbz9", + "hash": "QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, From 7b1963906bb364417ada02be022314ae392af846 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 11:36:41 +0100 Subject: [PATCH 20/55] update go-ipfs-cmds yet again License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 263c9fcfe..c5e2b244b 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -25,9 +25,9 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 105e1e1df..c7dd20d40 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 9f846bb37..63b713309 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,11 +31,11 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/cli" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/cli" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/http" ) // log is the command logger diff --git a/commands/command.go b/commands/command.go index 994c6c310..04ac4a8fc 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index fdfbb1dfb..deefb4a78 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index ea48f96c5..a8a1c12d7 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 8e03b114c..828004669 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 31b55f86e..28f61791f 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index a02526057..0043c155e 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index c9c2a2944..133999ebe 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 647e31fdc..5c26a5e8b 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 6008141b6..c3de4b20f 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 9718dc38a..f93b384f3 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 29b166f11..69d494ada 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,7 +20,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index ad6277eb9..e7c6baabb 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -13,8 +13,8 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 2488421f2..8193703e5 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -12,7 +12,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/cat.go b/core/commands/cat.go index b2166fdfe..c949ef827 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index af933bb40..4fa546742 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -15,7 +15,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 17e38ad63..542844033 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 53cc01592..ad15c2e0f 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,7 +13,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index e4c45a0bf..976735412 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,7 +17,7 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index f719eaf9a..7672a7fdc 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index e6244260e..4e28c32a0 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index e88f4398d..ae1a0e83f 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,7 +13,7 @@ import ( floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/repo.go b/core/commands/repo.go index 0949f127d..1b33fdf09 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,7 +19,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index 983b6b3a4..d15b1d5d1 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" + "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 7a69e8850..d483dda7d 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,8 +9,8 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" ) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index dbd30e7c1..1812a92ae 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt/go-ipfs-cmds/http" + cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index a2032d7de..506cee0a3 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmYEkjf6AXPMZgqoNUfDa7AYT6wPyNYnXnV4iPusGtusUt", + "hash": "QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, From 8f24d8e211c90ad41784f4f4853f32b8d8dee218 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 13:19:31 +0100 Subject: [PATCH 21/55] cleanup License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 20 +++++++++----------- cmd/ipfs/main.go | 3 --- commands/legacy/legacy.go | 26 -------------------------- commands/legacy/legacy_test.go | 29 ----------------------------- commands/request.go | 4 ++++ core/commands/add.go | 4 +++- core/commands/cat.go | 2 +- core/commands/commands.go | 1 - core/commands/get_test.go | 10 ++++------ test/sharness/t0110-gateway.sh | 2 +- 10 files changed, 22 insertions(+), 79 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index c5e2b244b..29d2f2053 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -18,7 +18,6 @@ import ( corehttp "github.com/ipfs/go-ipfs/core/corehttp" corerepo "github.com/ipfs/go-ipfs/core/corerepo" nodeMount "github.com/ipfs/go-ipfs/fuse/node" - //config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" @@ -200,7 +199,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { } } - ctx := env.(*oldcmds.Context) + cctx := env.(*oldcmds.Context) go func() { <-req.Context.Done() @@ -219,10 +218,9 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { // first, whether user has provided the initialization flag. we may be // running in an uninitialized state. initialize, _ := req.Options[initOptionKwd].(bool) - if initialize { - cfg := ctx.ConfigRoot + cfg := cctx.ConfigRoot if !fsrepo.IsInitialized(cfg) { err := initWithDefaults(os.Stdout, cfg) if err != nil { @@ -234,7 +232,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { // acquire the repo lock _before_ constructing a node. we need to make // sure we are permitted to access the resources (datastore, etc.) - repo, err := fsrepo.Open(ctx.ConfigRoot) + repo, err := fsrepo.Open(cctx.ConfigRoot) switch err { default: re.SetError(err, cmdkit.ErrNormal) @@ -264,7 +262,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { return } - repo, err = fsrepo.Open(ctx.ConfigRoot) + repo, err = fsrepo.Open(cctx.ConfigRoot) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -273,7 +271,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { break } - cfg, err := ctx.GetConfig() + cfg, err := cctx.GetConfig() if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -340,12 +338,12 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { } }() - ctx.ConstructNode = func() (*core.IpfsNode, error) { + cctx.ConstructNode = func() (*core.IpfsNode, error) { return node, nil } // construct api endpoint - every time - err, apiErrc := serveHTTPApi(req, ctx) + err, apiErrc := serveHTTPApi(req, cctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -359,7 +357,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { return } if mount { - if err := mountFuse(req, ctx); err != nil { + if err := mountFuse(req, cctx); err != nil { re.SetError(err, cmdkit.ErrNormal) return } @@ -376,7 +374,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { var gwErrc <-chan error if len(cfg.Addresses.Gateway) > 0 { var err error - err, gwErrc = serveHTTPGateway(req, ctx) + err, gwErrc = serveHTTPGateway(req, cctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 63b713309..e6dd46e58 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -108,11 +108,8 @@ func mainRet() int { } log.Debugf("config path is %s", repoPath) - // this sets up the function that will initialize the config lazily. - // this sets up the function that will initialize the node // this is so that we can construct the node lazily. - return &oldcmds.Context{ ConfigRoot: repoPath, LoadConfig: loadConfig, diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 828004669..61db54dcf 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -53,29 +53,3 @@ func OldContext(env interface{}) *oldcmds.Context { return ctx } - -/* -// OldReqLog returns an oldcmds.ReqLog from a ReqLog -func OldReqLog(newrl *ReqLog) *oldcmds.ReqLog { - if newrl == nil { - return nil - } - - rl := &oldcmds.ReqLog{} - - for _, rle := range newrl.Requests { - oldrle := &oldcmds.ReqLogEntry{ - StartTime: rle.StartTime, - EndTime: rle.EndTime, - Active: rle.Active, - Command: rle.Command, - Options: rle.Options, - Args: rle.Args, - ID: rle.ID, - } - rl.AddEntry(oldrle) - } - - return rl -} -*/ diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 28f61791f..30e79f148 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -184,32 +184,3 @@ func TestTeeEmitter(t *testing.T) { t.Fatal("expected %#v, got %#v", expect, buf2.String()) } } - -/* -type teeErrorTestCase struct { - err1, err2 error - bothNil bool - errString string -} - -func TestTeeError(t *testing.T) { - tcs := []teeErrorTestCase{ - teeErrorTestCase{nil, nil, true, ""}, - teeErrorTestCase{fmt.Errorf("error!"), nil, false, "1: error!"}, - teeErrorTestCase{nil, fmt.Errorf("error!"), false, "2: error!"}, - teeErrorTestCase{fmt.Errorf("error!"), fmt.Errorf("error!"), false, `1: error! -2: error!`}, - } - - for i, tc := range tcs { - teeError := cmds.TeeError{tc.err1, tc.err2} - if teeError.BothNil() != tc.bothNil { - t.Fatalf("BothNil()/%d: expected %v but got %v", i, tc.bothNil, teeError.BothNil()) - } - - if teeError.Error() != tc.errString { - t.Fatalf("Error()/%d: expected %v but got %v", i, tc.errString, teeError.Error()) - } - } -} -*/ diff --git a/commands/request.go b/commands/request.go index 5c26a5e8b..f0dd2b10e 100644 --- a/commands/request.go +++ b/commands/request.go @@ -76,6 +76,9 @@ func (c *Context) RootContext() context.Context { return n.Context() } +// LogRequest adds the passed request to the request log and +// returns a function that should be called when the request +// lifetime is over. func (c *Context) LogRequest(req *cmds.Request) func() { rle := &ReqLogEntry{ StartTime: time.Now(), @@ -93,6 +96,7 @@ func (c *Context) LogRequest(req *cmds.Request) func() { } } +// Close cleans up the application state. func (c *Context) Close() { // let's not forget teardown. If a node was initialized, we must close it. // Note that this means the underlying req.Context().Node variable is exposed. diff --git a/core/commands/add.go b/core/commands/add.go index 69d494ada..0c66cc0fa 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -145,6 +145,7 @@ You can now check what blocks have been created by: return nil } + // HACK! Using context to pass the size to PostRun sizeCh := make(chan int64, 1) req.Context = context.WithValue(req.Context, "size", sizeCh) @@ -366,6 +367,7 @@ You can now check what blocks have been created by: bar.Start() } + // HACK! using context to pass size from PreRun var sizeChan chan int64 sizeChan, _ = req.Context.Value("size").(chan int64) @@ -429,7 +431,7 @@ You can now check what blocks have been created by: bar.ShowTimeLeft = true } case <-req.Context.Done(): - //re.SetError(req.Context.Err(), cmdkit.ErrNormal) + // don't set or print error here, that happens in the goroutine below return } } diff --git a/core/commands/cat.go b/core/commands/cat.go index c949ef827..1034f7924 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -62,7 +62,7 @@ var CatCmd = &cmds.Command{ } err = req.ParseBodyArgs() - if err != nil && err.Error() != "all arguments covered by positional arguments" { + if err != nil && !cmds.IsAllArgsAlreadyCovered(err) { res.SetError(err, cmdkit.ErrNormal) return } diff --git a/core/commands/commands.go b/core/commands/commands.go index 4fa546742..bec5eca0f 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -11,7 +11,6 @@ import ( "sort" "strings" - // oldcmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 7672a7fdc..7850bfa69 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -45,12 +45,10 @@ func TestGetOutputPath(t *testing.T) { }, } - /* - defOpts, err := GetCmd.GetOptions([]string{}) - if err != nil { - t.Fatalf("error getting default command options: %v", err) - } - */ + _, err := GetCmd.GetOptions([]string{}) + if err != nil { + t.Fatalf("error getting default command options: %v", err) + } for _, tc := range cases { req, err := cmds.NewRequest(context.TODO(), []string{}, tc.opts, tc.args, nil, GetCmd) diff --git a/test/sharness/t0110-gateway.sh b/test/sharness/t0110-gateway.sh index fa37c5b21..c5a4aa39c 100755 --- a/test/sharness/t0110-gateway.sh +++ b/test/sharness/t0110-gateway.sh @@ -135,7 +135,7 @@ test_expect_success "get IPFS directory file through readonly API output looks g test_cmp dir/test actual ' -test_expect_failure "refs IPFS directory file through readonly API succeeds" ' +test_expect_success "refs IPFS directory file through readonly API succeeds" ' test_curl_gateway_api "refs?arg=$HASH2/test" ' From 1cc7e2a28eb99b7e167e6d29e0b426f7128654a7 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 13:24:14 +0100 Subject: [PATCH 22/55] update go-ipfs-cmds License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 29d2f2053..3a1b38392 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -24,7 +24,7 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index c7dd20d40..d84e9d7be 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index e6dd46e58..531a9361b 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,9 +31,9 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/cli" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/http" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/cli" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" ) diff --git a/commands/command.go b/commands/command.go index 04ac4a8fc..3b7be8a76 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index deefb4a78..4e3bdc7a9 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index a8a1c12d7..228ceab0e 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 61db54dcf..c656d3162 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 30e79f148..03fa4c685 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 0043c155e..227676f6f 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 133999ebe..6118ef9b4 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index f0dd2b10e..020d5a8cf 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index c3de4b20f..494a7df3a 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index f93b384f3..d0a806cec 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 0c66cc0fa..186e31048 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,7 +20,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index e7c6baabb..5b102ae41 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -13,7 +13,7 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 8193703e5..bd6ad48ea 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -12,7 +12,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/cat.go b/core/commands/cat.go index 1034f7924..6cd0ab8ca 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index bec5eca0f..04358c97d 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,7 +14,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 542844033..618d6dc2f 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index ad15c2e0f..c1d067249 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,7 +13,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 976735412..4ce92ead2 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,7 +17,7 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 7850bfa69..67e097829 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 4e28c32a0..848ddcf9b 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index ae1a0e83f..07e861b3e 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,7 +13,7 @@ import ( floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/repo.go b/core/commands/repo.go index 1b33fdf09..b6234f255 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,7 +19,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index d15b1d5d1..5591486cc 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index d483dda7d..457cb6394 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,7 +9,7 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 1812a92ae..cf49cc56f 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t/go-ipfs-cmds/http" + cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 506cee0a3..161b5cc1b 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmUjA7onJjYmZ2TivD83MeCfXf5o1U4ByVJWPjRru5NA4t", + "hash": "QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, From 091eeee2433d8f7b425a0d24addaa31d8f9303eb Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 13:37:32 +0100 Subject: [PATCH 23/55] update go-ipfs-cmds License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 3a1b38392..bccc6d8e7 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -24,7 +24,7 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index d84e9d7be..2350091bc 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 531a9361b..c1bbcb6ed 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,9 +31,9 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/cli" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/http" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/cli" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" ) diff --git a/commands/command.go b/commands/command.go index 3b7be8a76..3068ed4c9 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 4e3bdc7a9..91103422e 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 228ceab0e..aec620cdd 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index c656d3162..9051ce318 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 03fa4c685..a256a0755 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 227676f6f..a1d0734d7 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 6118ef9b4..640c2568a 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 020d5a8cf..b29da87d3 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 494a7df3a..93b4c517a 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index d0a806cec..91d27e0b8 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 186e31048..eaa50bdab 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,7 +20,7 @@ import ( "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 5b102ae41..1b857092e 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -13,7 +13,7 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index bd6ad48ea..eb524e431 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -12,7 +12,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/cat.go b/core/commands/cat.go index 6cd0ab8ca..a8b4cefb8 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index 04358c97d..000cdcfd7 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,7 +14,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 618d6dc2f..53daba856 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index c1d067249..506345a20 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,7 +13,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 4ce92ead2..8f063489e 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,7 +17,7 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 67e097829..aa0d89e52 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "testing" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 848ddcf9b..0ec2b2929 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 07e861b3e..18a7eedc3 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,7 +13,7 @@ import ( floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/commands/repo.go b/core/commands/repo.go index b6234f255..1844687dc 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,7 +19,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index 5591486cc..0e672e105 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 457cb6394..39eb1aaea 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -9,7 +9,7 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index cf49cc56f..09b6cdf66 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t/go-ipfs-cmds/http" + cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 161b5cc1b..cef6895cd 100644 --- a/package.json +++ b/package.json @@ -414,7 +414,7 @@ "version": "2.1.2" }, { - "hash": "QmUkTTz5YDkkJWFYfEUpgsR1cvY4KjBzo5VXwwB7UVCn1t", + "hash": "QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr", "name": "go-ipfs-cmds", "version": "1.0.0-dev" }, From aec44bc430542d4f7a2cee906ad9da3e17722529 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 17:41:00 +0100 Subject: [PATCH 24/55] use *oldcmds.Context consistently instead of non-ptr License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 4 ++-- cmd/ipfswatch/main.go | 4 ++-- core/corehttp/commands.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index bccc6d8e7..5a8a62032 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), corehttp.CheckVersionOption(), - corehttp.CommandsOption(*cctx), + corehttp.CommandsOption(cctx), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), @@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("gateway"), corehttp.CheckVersionOption(), - corehttp.CommandsROOption(*cctx), + corehttp.CommandsROOption(cctx), corehttp.VersionOption(), corehttp.IPNSHostnameOption(), corehttp.GatewayOption(writable, "/ipfs", "/ipns"), diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 6a8dda1b0..492686293 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -186,8 +186,8 @@ func IsHidden(path string) bool { return false } -func cmdCtx(node *core.IpfsNode, repoPath string) commands.Context { - return commands.Context{ +func cmdCtx(node *core.IpfsNode, repoPath string) *commands.Context { + return &commands.Context{ Online: true, ConfigRoot: repoPath, LoadConfig: func(path string) (*config.Config, error) { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 09b6cdf66..9c4dcd176 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) { c.SetAllowedOrigins(origins...) } -func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { +func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption { return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) { cfg := cmdsHttp.NewServerConfig() @@ -132,11 +132,11 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { } } -func CommandsOption(cctx oldcmds.Context) ServeOption { +func CommandsOption(cctx *oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.Root) } -func CommandsROOption(cctx oldcmds.Context) ServeOption { +func CommandsROOption(cctx *oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) } From 8061117e0c95293285e6956fa9533d53d2c6f02f Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 17:41:17 +0100 Subject: [PATCH 25/55] core/commands: add TestROCommands License: MIT Signed-off-by: keks --- core/commands/commands_test.go | 51 ++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 53daba856..db5ec744a 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -15,6 +15,57 @@ func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { } } +func TestROCommands(t *testing.T) { + list := []string{ + "/block", + "/block/get", + "/block/stat", + "/cat", + "/commands", + "/dag", + "/dag/get", + "/dag/resolve", + "/dns", + "/get", + "/ls", + "/name", + "/name/resolve", + "/object", + "/object/data", + "/object/get", + "/object/links", + "/object/stat", + "/refs", + "/resolve", + "/version", + } + + cmdSet := make(map[string]struct{}) + collectPaths("", RootRO, cmdSet) + + for _, path := range list { + if _, ok := cmdSet[path]; !ok { + t.Errorf("%q not in result", path) + } else { + delete(cmdSet, path) + } + } + + for path := range cmdSet { + t.Errorf("%q in result but shouldn't be", path) + } + + for _, path := range list { + path = path[1:] // remove leading slash + split := strings.Split(path, "/") + sub, err := RootRO.Get(split) + if err != nil { + t.Errorf("error getting subcommand %q: %v", path, err) + } else if sub == nil { + t.Errorf("subcommand %q is nil even though there was no error", path) + } + } +} func TestCommands(t *testing.T) { list := []string{ "/add", From c2ffb8e73b12769b9b99d0d5c8e3cc5bfafd022f Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 18:38:02 +0100 Subject: [PATCH 26/55] make executable name in command output stable by setting os.Args[0] to "ipfs" License: MIT Signed-off-by: keks --- cmd/ipfs/main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index c1bbcb6ed..b3261589f 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -101,6 +101,10 @@ func mainRet() int { } } + // output depends on excecutable name passed in os.Args + // so we need to make sure it's stable + os.Args[0] = "ipfs" + buildEnv := func(ctx context.Context, req *cmds.Request) (interface{}, error) { repoPath, err := getRepoPath(req) if err != nil { From d93c0b6a4b75fa886e2fd6c0ec587d04be0a20c2 Mon Sep 17 00:00:00 2001 From: keks Date: Wed, 20 Dec 2017 18:46:34 +0100 Subject: [PATCH 27/55] Revert "use *oldcmds.Context consistently instead of non-ptr" This reverts commit 852adb1c4a42a254286ac26b3bae7ea3a7bb69df. License: MIT Signed-off-by: keks --- cmd/ipfs/daemon.go | 4 ++-- cmd/ipfswatch/main.go | 4 ++-- core/corehttp/commands.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 5a8a62032..bccc6d8e7 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("api"), corehttp.CheckVersionOption(), - corehttp.CommandsOption(cctx), + corehttp.CommandsOption(*cctx), corehttp.WebUIOption, gatewayOpt, corehttp.VersionOption(), @@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e var opts = []corehttp.ServeOption{ corehttp.MetricsCollectionOption("gateway"), corehttp.CheckVersionOption(), - corehttp.CommandsROOption(cctx), + corehttp.CommandsROOption(*cctx), corehttp.VersionOption(), corehttp.IPNSHostnameOption(), corehttp.GatewayOption(writable, "/ipfs", "/ipns"), diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 492686293..6a8dda1b0 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -186,8 +186,8 @@ func IsHidden(path string) bool { return false } -func cmdCtx(node *core.IpfsNode, repoPath string) *commands.Context { - return &commands.Context{ +func cmdCtx(node *core.IpfsNode, repoPath string) commands.Context { + return commands.Context{ Online: true, ConfigRoot: repoPath, LoadConfig: func(path string) (*config.Config, error) { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 9c4dcd176..09b6cdf66 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) { c.SetAllowedOrigins(origins...) } -func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption { +func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) { cfg := cmdsHttp.NewServerConfig() @@ -132,11 +132,11 @@ func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption { } } -func CommandsOption(cctx *oldcmds.Context) ServeOption { +func CommandsOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.Root) } -func CommandsROOption(cctx *oldcmds.Context) ServeOption { +func CommandsROOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) } From 267c19ab9ddb3c8fd495c5def756ce455510b778 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sat, 6 Jan 2018 14:28:16 -0800 Subject: [PATCH 28/55] some fixes for latest from go-ipfs-cmds License: MIT Signed-off-by: Jeromy --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/init.go | 2 +- cmd/ipfs/main.go | 2 +- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 4 ++-- commands/legacy/response.go | 2 +- commands/legacy/responseemitter.go | 2 +- commands/request.go | 4 ++-- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/active.go | 2 +- core/commands/add.go | 4 ++-- core/commands/bitswap.go | 2 +- core/commands/block.go | 4 ++-- core/commands/bootstrap.go | 2 +- core/commands/cat.go | 4 ++-- core/commands/commands.go | 2 +- core/commands/config.go | 2 +- core/commands/dag/dag.go | 4 ++-- core/commands/dht.go | 2 +- core/commands/diag.go | 2 +- core/commands/dns.go | 2 +- core/commands/external.go | 2 +- core/commands/files/files.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 4 ++-- core/commands/get_test.go | 2 +- core/commands/id.go | 2 +- core/commands/ipns.go | 2 +- core/commands/ipnsps.go | 2 +- core/commands/keystore.go | 2 +- core/commands/log.go | 2 +- core/commands/ls.go | 2 +- core/commands/mount_nofuse.go | 2 +- core/commands/mount_unix.go | 2 +- core/commands/mount_windows.go | 2 +- core/commands/name.go | 2 +- core/commands/object/diff.go | 2 +- core/commands/object/object.go | 2 +- core/commands/object/patch.go | 2 +- core/commands/p2p.go | 2 +- core/commands/pin.go | 2 +- core/commands/ping.go | 2 +- core/commands/publish.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/refs.go | 2 +- core/commands/repo.go | 2 +- core/commands/resolve.go | 2 +- core/commands/root.go | 2 +- core/commands/shutdown.go | 2 +- core/commands/stat.go | 2 +- core/commands/swarm.go | 2 +- core/commands/sysdiag.go | 2 +- core/commands/tar.go | 2 +- core/commands/unixfs/ls.go | 2 +- core/commands/unixfs/unixfs.go | 2 +- core/commands/version.go | 2 +- core/corehttp/commands.go | 1 + core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 2 +- importer/helpers/dagbuilder.go | 2 +- importer/importer.go | 2 +- package.json | 2 +- 65 files changed, 72 insertions(+), 71 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index bccc6d8e7..92bac0f98 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -22,11 +22,11 @@ import ( migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 1d35ecc9f..1215d0481 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) const ( diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index b3261589f..7cf9af65d 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -226,7 +226,7 @@ func commandDetails(path []string, root *cmds.Command) (*cmdDetails, error) { // find the last command in path that has a cmdDetailsMap entry cmd := root for _, cmp := range path { - cmd = cmd.Subcommand(cmp) + cmd = cmd.Subcommands[cmp] if cmd == nil { return nil, fmt.Errorf("subcommand %s should be in root", cmp) } diff --git a/commands/command.go b/commands/command.go index 3068ed4c9..0150b00aa 100644 --- a/commands/command.go +++ b/commands/command.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 91103422e..966d642e9 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) func noop(req Request, res Response) { diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index a256a0755..bf7b6a8bb 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index a1d0734d7..705d7756f 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 640c2568a..f1b7d2438 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/responseemitter.go b/commands/legacy/responseemitter.go index 16da22bb6..923b5ff29 100644 --- a/commands/legacy/responseemitter.go +++ b/commands/legacy/responseemitter.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index b29da87d3..0991199b9 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 93b4c517a..0872b37af 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 91d27e0b8..a6a58f1d7 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type TestOutput struct { diff --git a/core/commands/active.go b/core/commands/active.go index 3e577df74..299b86bed 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -11,7 +11,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var ActiveReqsCmd = &cmds.Command{ diff --git a/core/commands/add.go b/core/commands/add.go index eaa50bdab..5db31c8a2 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,10 +18,10 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 1b857092e..72d744177 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,9 +12,9 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index eb524e431..caccac309 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,10 +11,10 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) @@ -299,7 +299,7 @@ It takes a list of base58 encoded multihashs to remove. log.Error(err) } }, - PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index 43a07f192..bc7ce4c55 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -12,7 +12,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type BootstrapOutput struct { diff --git a/core/commands/cat.go b/core/commands/cat.go index a8b4cefb8..5ac043ac0 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB @@ -92,7 +92,7 @@ var CatCmd = &cmds.Command{ res.SetError(err, cmdkit.ErrNormal) } }, - PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) diff --git a/core/commands/commands.go b/core/commands/commands.go index 000cdcfd7..02ca2266d 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -13,8 +13,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type commandEncoder struct { diff --git a/core/commands/config.go b/core/commands/config.go index 6b20101c7..2ac87b489 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -17,7 +17,7 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type ConfigField struct { diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 321e41521..fc7872417 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -13,10 +13,10 @@ import ( path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" - files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + files "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/dht.go b/core/commands/dht.go index 5597936d1..e84ff4b41 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -15,10 +15,10 @@ import ( routing "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing" notif "gx/ipfs/QmPCGUjMRuBcPybZFpjhzpifwPP9wPRoiy5geTQKU4vqWA/go-libp2p-routing/notifications" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ipdht "gx/ipfs/QmfUvYQhL2GinafMbPDYz7VFoZv4iiuLuR33aRsPurXGag/go-libp2p-kad-dht" ) diff --git a/core/commands/diag.go b/core/commands/diag.go index 19caa4418..f3b02f9ec 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var DiagCmd = &cmds.Command{ diff --git a/core/commands/dns.go b/core/commands/dns.go index 3f265dc46..c7254b888 100644 --- a/core/commands/dns.go +++ b/core/commands/dns.go @@ -8,7 +8,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" namesys "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var DNSCmd = &cmds.Command{ diff --git a/core/commands/external.go b/core/commands/external.go index 73011280f..5cf610f80 100644 --- a/core/commands/external.go +++ b/core/commands/external.go @@ -10,7 +10,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) func ExternalBinary() *cmds.Command { diff --git a/core/commands/files/files.go b/core/commands/files/files.go index 5a422b2fc..861972c17 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -20,9 +20,9 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 506345a20..e8a5dd795 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index 8f063489e..84f72ac8e 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) @@ -101,7 +101,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. res.Emit(reader) }, - PostRun: map[cmds.EncodingType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index aa0d89e52..bf838dc3f 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/id.go b/core/commands/id.go index b08bfac0b..f75cab121 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -13,12 +13,12 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" kb "gx/ipfs/QmQEo84PQQPJpx9Bf2YxerGVgmgWvQ9iwuZBAJaNJKWREr/go-libp2p-kbucket" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" identify "gx/ipfs/Qma23bpHwQrQyvKeBemaeJh7sAoRHggPkgnge1B9489ff5/go-libp2p/p2p/protocol/identify" ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) const offlineIdErrorMessage = `'ipfs id' currently cannot query information on remote diff --git a/core/commands/ipns.go b/core/commands/ipns.go index 4faaa0be9..f84ffbfb6 100644 --- a/core/commands/ipns.go +++ b/core/commands/ipns.go @@ -10,7 +10,7 @@ import ( namesys "github.com/ipfs/go-ipfs/namesys" offline "github.com/ipfs/go-ipfs/routing/offline" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var IpnsCmd = &cmds.Command{ diff --git a/core/commands/ipnsps.go b/core/commands/ipnsps.go index 332b73bb9..a13d48aa3 100644 --- a/core/commands/ipnsps.go +++ b/core/commands/ipnsps.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" ns "github.com/ipfs/go-ipfs/namesys" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type ipnsPubsubState struct { diff --git a/core/commands/keystore.go b/core/commands/keystore.go index c189094db..24516d76c 100644 --- a/core/commands/keystore.go +++ b/core/commands/keystore.go @@ -12,9 +12,9 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var KeyCmd = &cmds.Command{ diff --git a/core/commands/log.go b/core/commands/log.go index 7a638230f..96d82d943 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -6,8 +6,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) // Golang os.Args overrides * and replaces the character argument with diff --git a/core/commands/ls.go b/core/commands/ls.go index 335a0049f..094c9186f 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -18,7 +18,7 @@ import ( unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index e16c47164..4fcff7d0c 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -6,7 +6,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index b41a16a1e..1a4d71bff 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -13,7 +13,7 @@ import ( nodeMount "github.com/ipfs/go-ipfs/fuse/node" config "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index de45a2932..fd4713cdc 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -5,7 +5,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var MountCmd = &cmds.Command{ diff --git a/core/commands/name.go b/core/commands/name.go index c9535f608..e5eede1f9 100644 --- a/core/commands/name.go +++ b/core/commands/name.go @@ -3,7 +3,7 @@ package commands import ( cmds "github.com/ipfs/go-ipfs/commands" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type IpnsEntry struct { diff --git a/core/commands/object/diff.go b/core/commands/object/diff.go index 51fed0008..db3303d32 100644 --- a/core/commands/object/diff.go +++ b/core/commands/object/diff.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" dagutils "github.com/ipfs/go-ipfs/merkledag/utils" path "github.com/ipfs/go-ipfs/path" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type Changes struct { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 5c5d26d99..032b8ada0 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -21,7 +21,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index f3d004e70..e41d355fe 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -13,8 +13,8 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var log = logging.Logger("core/commands/object") diff --git a/core/commands/p2p.go b/core/commands/p2p.go index cd02e9e0a..5f229ffbf 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -11,8 +11,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) // P2PListenerInfoOutput is output type of ls command diff --git a/core/commands/pin.go b/core/commands/pin.go index 0d051a15d..646f0f54b 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -17,7 +17,7 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/ping.go b/core/commands/ping.go index 5bc3e17ae..c3af1e6b2 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -13,10 +13,10 @@ import ( core "github.com/ipfs/go-ipfs/core" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) const kPingTimeout = 10 * time.Second diff --git a/core/commands/publish.go b/core/commands/publish.go index cb4c7d610..fc6230663 100644 --- a/core/commands/publish.go +++ b/core/commands/publish.go @@ -14,9 +14,9 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" crypto "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var errNotOnline = errors.New("This command must be run in online mode. Try running 'ipfs daemon' first.") diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 18a7eedc3..6fbf971a8 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,10 +12,10 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/refs.go b/core/commands/refs.go index 7d15ac95c..e1c687795 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -14,7 +14,7 @@ import ( path "github.com/ipfs/go-ipfs/path" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index 1844687dc..4e1de94e8 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,8 +18,8 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/resolve.go b/core/commands/resolve.go index 64541c756..eeec547d4 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -10,7 +10,7 @@ import ( ns "github.com/ipfs/go-ipfs/namesys" path "github.com/ipfs/go-ipfs/path" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type ResolvedPath struct { diff --git a/core/commands/root.go b/core/commands/root.go index 0e672e105..d39fae5c1 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -12,9 +12,9 @@ import ( unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs" lgc "github.com/ipfs/go-ipfs/commands/legacy" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var log = logging.Logger("core/commands") diff --git a/core/commands/shutdown.go b/core/commands/shutdown.go index c5532f7f4..a68daf631 100644 --- a/core/commands/shutdown.go +++ b/core/commands/shutdown.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/core/commands/stat.go b/core/commands/stat.go index 39eb1aaea..3832d9652 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,11 +8,11 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var StatsCmd = &cmds.Command{ diff --git a/core/commands/swarm.go b/core/commands/swarm.go index a378ad9b9..ec86d2b63 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -16,10 +16,10 @@ import ( "github.com/ipfs/go-ipfs/repo/fsrepo" mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" swarm "gx/ipfs/QmUhvp4VoQ9cKDVLqAxciEKdm8ymBx2Syx4C1Tv6SmSTPa/go-libp2p-swarm" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" iaddr "gx/ipfs/QmdMeXVB1V1SAZcFzoCuM3zR9K8PeuzCYg4zXNHcHh6dHU/go-ipfs-addr" ) diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 959a1abac..2206288f7 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -9,8 +9,8 @@ import ( config "github.com/ipfs/go-ipfs/repo/config" manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var sysDiagCmd = &cmds.Command{ diff --git a/core/commands/tar.go b/core/commands/tar.go index 2d000b565..98cf89750 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -12,7 +12,7 @@ import ( path "github.com/ipfs/go-ipfs/path" tar "github.com/ipfs/go-ipfs/tar" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var TarCmd = &cmds.Command{ diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index cd5a0ec7a..952b212e4 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -15,7 +15,7 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - cmdkit "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type LsLink struct { diff --git a/core/commands/unixfs/unixfs.go b/core/commands/unixfs/unixfs.go index d7ca9b375..1d5998ff1 100644 --- a/core/commands/unixfs/unixfs.go +++ b/core/commands/unixfs/unixfs.go @@ -4,7 +4,7 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) var UnixFSCmd = &cmds.Command{ diff --git a/core/commands/version.go b/core/commands/version.go index 9f0aeab69..133519e67 100644 --- a/core/commands/version.go +++ b/core/commands/version.go @@ -10,7 +10,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" config "github.com/ipfs/go-ipfs/repo/config" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) type VersionOutput struct { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 09b6cdf66..8c245ca8e 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -73,6 +73,7 @@ func addHeadersFromConfig(c *cmdsHttp.ServerConfig, nc *config.Config) { } c.Headers = nc.API.HTTPHeaders + c.Headers["Server"] = []string{"go-ipfs/" + config.CurrentVersionNumber} } func addCORSDefaults(c *cmdsHttp.ServerConfig) { diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 1419b7b5b..287fe4f07 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -25,8 +25,8 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + files "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 27e99bb72..5ee2ef58c 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -20,8 +20,8 @@ import ( ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2" pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go index ed20929d8..0c6e9c5e0 100644 --- a/importer/helpers/dagbuilder.go +++ b/importer/helpers/dagbuilder.go @@ -9,7 +9,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" - files "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" + files "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/importer/importer.go b/importer/importer.go index 138d5bcee..32b8de18b 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -11,7 +11,7 @@ import ( h "github.com/ipfs/go-ipfs/importer/helpers" trickle "github.com/ipfs/go-ipfs/importer/trickle" dag "github.com/ipfs/go-ipfs/merkledag" - "gx/ipfs/QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM/go-ipfs-cmdkit/files" + "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format" ) diff --git a/package.json b/package.json index cef6895cd..63786352f 100644 --- a/package.json +++ b/package.json @@ -419,7 +419,7 @@ "version": "1.0.0-dev" }, { - "hash": "QmSRaAPPNxyhnXeDa5NXtZ2CWBYJ6BRWNQp6gKxhPcoqDM", + "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM", "name": "go-ipfs-cmdkit", "version": "1.0.0-dev" }, From bf804cca669f40d8a28fade4e11949a5eaf533ae Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 8 Jan 2018 18:37:46 -0800 Subject: [PATCH 29/55] update to final cmds1.0 License: MIT Signed-off-by: Jeromy --- cmd/ipfs/daemon.go | 4 ++-- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 8 ++++---- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 6 +++--- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 4 ++-- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 6 +++--- core/commands/bitswap.go | 4 ++-- core/commands/block.go | 12 ++++++------ core/commands/cat.go | 4 ++-- core/commands/commands.go | 4 ++-- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 4 ++-- core/commands/get.go | 6 +++--- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 10 +++++----- core/commands/repo.go | 4 ++-- core/commands/root.go | 2 +- core/commands/stat.go | 4 ++-- core/corehttp/commands.go | 4 ++-- package.json | 4 ++-- 29 files changed, 57 insertions(+), 57 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 92bac0f98..65e2a8155 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -23,11 +23,11 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) const ( @@ -182,7 +182,7 @@ func defaultMux(path string) corehttp.ServeOption { } } -func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { +func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) { // Inject metrics before we do anything err := mprome.Inject() if err != nil { diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 2350091bc..38fa59427 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 7cf9af65d..88e5a1913 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,11 +31,11 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/cli" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/cli" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" ) // log is the command logger @@ -105,7 +105,7 @@ func mainRet() int { // so we need to make sure it's stable os.Args[0] = "ipfs" - buildEnv := func(ctx context.Context, req *cmds.Request) (interface{}, error) { + buildEnv := func(ctx context.Context, req *cmds.Request) (cmds.Environment, error) { repoPath, err := getRepoPath(req) if err != nil { return nil, err diff --git a/commands/command.go b/commands/command.go index 0150b00aa..769dca39c 100644 --- a/commands/command.go +++ b/commands/command.go @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-ipfs/path" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 966d642e9..37ddb6987 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index aec620cdd..055ac3d0d 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" @@ -29,7 +29,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command { } if oldcmd.Run != nil { - cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { + cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) { oldReq := &requestWrapper{req, OldContext(env)} res := &fakeResponse{req: oldReq, re: re, wait: make(chan struct{})} @@ -44,7 +44,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command { } if oldcmd.PreRun != nil { - cmd.PreRun = func(req *cmds.Request, env interface{}) error { + cmd.PreRun = func(req *cmds.Request, env cmds.Environment) error { oldReq := &requestWrapper{req, OldContext(env)} return oldcmd.PreRun(oldReq) } diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 9051ce318..449eccb75 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index bf7b6a8bb..27738b70a 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 705d7756f..0005176a6 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index f1b7d2438..64ef34850 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 0991199b9..0962e0080 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type Context struct { @@ -66,7 +66,7 @@ func (c *Context) NodeWithoutConstructing() *core.IpfsNode { } // RootContext returns the node's context. -func (c *Context) RootContext() context.Context { +func (c *Context) Context() context.Context { n, err := c.GetNode() if err != nil { log.Debug("error getting node: ", err) diff --git a/commands/response.go b/commands/response.go index 0872b37af..114136755 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index a6a58f1d7..2a6c84d9f 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 5db31c8a2..aa2b50bb1 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,11 +18,11 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // ErrDepthLimitExceeded indicates that the max depth has been exceded. @@ -121,7 +121,7 @@ You can now check what blocks have been created by: cmdkit.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").WithDefault(0), cmdkit.StringOption(hashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)").WithDefault("sha2-256"), }, - PreRun: func(req *cmds.Request, env interface{}) error { + PreRun: func(req *cmds.Request, env cmds.Environment) error { quiet, _ := req.Options[quietOptionName].(bool) quieter, _ := req.Options[quieterOptionName].(bool) quiet = quiet || quieter @@ -162,7 +162,7 @@ You can now check what blocks have been created by: return nil }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 72d744177..e0dd6a227 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,10 +12,10 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var BitswapCmd = &cmds.Command{ @@ -139,7 +139,7 @@ var bitswapStatCmd = &cmds.Command{ ShortDescription: ``, }, Type: bitswap.Stat{}, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/block.go b/core/commands/block.go index caccac309..a15136d8e 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,11 +11,11 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type BlockStat struct { @@ -61,7 +61,7 @@ on raw IPFS blocks. It outputs the following to stdout: Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to stat.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -101,7 +101,7 @@ It outputs to stdout, and is a base58 encoded multihash. Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to get.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -132,7 +132,7 @@ It reads from stdin, and is a base58 encoded multihash. cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"), cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -226,7 +226,7 @@ It reads from stdin, and is a base58 encoded multihash. Type: BlockStat{}, } -func getBlockForKey(ctx context.Context, env interface{}, skey string) (blocks.Block, error) { +func getBlockForKey(ctx context.Context, env cmds.Environment, skey string) (blocks.Block, error) { if len(skey) == 0 { return nil, fmt.Errorf("zero length cid invalid") } @@ -264,7 +264,7 @@ It takes a list of base58 encoded multihashs to remove. cmdkit.BoolOption("force", "f", "Ignore nonexistent blocks."), cmdkit.BoolOption("quiet", "q", "Write minimal output."), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/cat.go b/core/commands/cat.go index 5ac043ac0..b1a282298 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB @@ -28,7 +28,7 @@ var CatCmd = &cmds.Command{ cmdkit.IntOption("offset", "o", "Byte offset to begin reading from."), cmdkit.IntOption("length", "l", "Maximum number of bytes to read."), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { node, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/commands.go b/core/commands/commands.go index 02ca2266d..d50a9e32e 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -13,8 +13,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type commandEncoder struct { @@ -68,7 +68,7 @@ func CommandsCmd(root *cmds.Command) *cmds.Command { Options: []cmdkit.Option{ cmdkit.BoolOption(flagsOptionName, "f", "Show command flags"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { rootCmd := cmd2outputCmd("ipfs", root) rootCmd.showOpts, _ = req.Options[flagsOptionName].(bool) err := res.Emit(&rootCmd) diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index db5ec744a..b16a48a07 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index e8a5dd795..916f8d439 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,9 +12,9 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var FileStoreCmd = &cmds.Command{ @@ -53,7 +53,7 @@ The output is: Options: []cmdkit.Option{ cmdkit.BoolOption("file-order", "sort the results based on the path of the backing file"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { _, fs, err := getFilestore(env.(*oldCmds.Context)) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/get.go b/core/commands/get.go index 84f72ac8e..2706447d9 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,9 +16,9 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var ErrInvalidCompressionLevel = errors.New("Compression level must be between 1 and 9") @@ -48,11 +48,11 @@ may also specify the level of compression by specifying '-l=<1-9>'. cmdkit.BoolOption("compress", "C", "Compress the output with GZIP compression."), cmdkit.IntOption("compression-level", "l", "The level of compression (1-9).").WithDefault(-1), }, - PreRun: func(req *cmds.Request, env interface{}) error { + PreRun: func(req *cmds.Request, env cmds.Environment) error { _, err := getCompressOptions(req) return err }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { if len(req.Arguments) == 0 { res.SetError(errors.New("not enough arugments provided"), cmdkit.ErrClient) return diff --git a/core/commands/get_test.go b/core/commands/get_test.go index bf838dc3f..2cf930725 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 0ec2b2929..d3ea78d7e 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 6fbf971a8..84f6670ae 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,11 +12,11 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var PubsubCmd = &cmds.Command{ @@ -70,7 +70,7 @@ This command outputs data in the following encodings: Options: []cmdkit.Option{ cmdkit.BoolOption("discover", "try to discover other peers subscribed to the same topic"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -203,7 +203,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. cmdkit.StringArg("topic", true, false, "Topic to publish to."), cmdkit.StringArg("data", true, true, "Payload of message to publish.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -244,7 +244,7 @@ to be used in a production environment. To use, the daemon must be run with '--enable-pubsub-experiment'. `, }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -286,7 +286,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. Arguments: []cmdkit.Argument{ cmdkit.StringArg("topic", false, false, "topic to list connected peers of"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/repo.go b/core/commands/repo.go index 4e1de94e8..b2e419347 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,9 +18,9 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type RepoVersion struct { @@ -159,7 +159,7 @@ RepoSize int Size in bytes that the repo is currently taking. Version string The repo version. `, }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/root.go b/core/commands/root.go index d39fae5c1..03a10f803 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -13,8 +13,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 3832d9652..1350be497 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,11 +8,11 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var StatsCmd = &cmds.Command{ @@ -79,7 +79,7 @@ Example: "ns", "us" (or "µs"), "ms", "s", "m", "h".`).WithDefault("1s"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 8c245ca8e..b299a437d 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 63786352f..77ea65efb 100644 --- a/package.json +++ b/package.json @@ -414,9 +414,9 @@ "version": "2.1.2" }, { - "hash": "QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr", + "hash": "QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM", "name": "go-ipfs-cmds", - "version": "1.0.0-dev" + "version": "1.0.0" }, { "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM", From 2e2996223f9957c55683e837cfe5e4c7193055d7 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 10 Jan 2018 16:08:56 -0800 Subject: [PATCH 30/55] fix legacy tests * remove test for removed feature * fix `TestNewCommand` test. License: MIT Signed-off-by: Steven Allen --- commands/legacy/legacy_test.go | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 27738b70a..202de38c9 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -68,7 +68,7 @@ func TestNewCommand(t *testing.T) { buf := bytes.NewBuffer(nil) // test calling "test" command - testCmd := root.Subcommand("test") + testCmd := root.Subcommands["test"] enc := testCmd.Encoders[oldcmds.Text] if enc == nil { t.Fatal("got nil encoder") @@ -91,7 +91,7 @@ func TestNewCommand(t *testing.T) { } // test getting subcommand - subCmd := testCmd.Subcommand("sub") + subCmd := testCmd.Subcommands["sub"] if subCmd == nil { t.Fatal("got nil subcommand") } @@ -155,32 +155,3 @@ func TestPipePair(t *testing.T) { <-wait } - -func TestTeeEmitter(t *testing.T) { - req, err := cmds.NewRequest(nil, nil, nil, nil, nil, nil) - if err != nil { - t.Fatal(err) - } - - buf1 := bytes.NewBuffer(nil) - re1 := cmds.NewWriterResponseEmitter(WriteNopCloser{buf1}, req, cmds.Encoders[cmds.Text]) - - buf2 := bytes.NewBuffer(nil) - re2 := cmds.NewWriterResponseEmitter(WriteNopCloser{buf2}, req, cmds.Encoders[cmds.Text]) - - re := cmds.NewTeeEmitter(re1, re2) - - expect := "def" - err = re.Emit(expect) - if err != nil { - t.Fatal(err) - } - - if buf1.String() != expect { - t.Fatal("expected %#v, got %#v", expect, buf1.String()) - } - - if buf2.String() != expect { - t.Fatal("expected %#v, got %#v", expect, buf2.String()) - } -} From cddef3ec5ee130631c31596b76d6ef618ddc1a3d Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 10 Jan 2018 17:11:19 -0800 Subject: [PATCH 31/55] use PostRunMap when constructing PostRun in commands Writing out the full type explicitly is ugly and verbose. License: MIT Signed-off-by: Steven Allen --- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/get.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/commands/block.go b/core/commands/block.go index a15136d8e..eee1d6e87 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -299,7 +299,7 @@ It takes a list of base58 encoded multihashs to remove. log.Error(err) } }, - PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: cmds.PostRunMap{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) diff --git a/core/commands/cat.go b/core/commands/cat.go index b1a282298..80e51c234 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -92,7 +92,7 @@ var CatCmd = &cmds.Command{ res.SetError(err, cmdkit.ErrNormal) } }, - PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: cmds.PostRunMap{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) diff --git a/core/commands/get.go b/core/commands/get.go index 2706447d9..0aae7f7c1 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -101,7 +101,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. res.Emit(reader) }, - PostRun: map[cmds.PostRunType]func(*cmds.Request, cmds.ResponseEmitter) cmds.ResponseEmitter{ + PostRun: cmds.PostRunMap{ cmds.CLI: func(req *cmds.Request, re cmds.ResponseEmitter) cmds.ResponseEmitter { reNext, res := cmds.NewChanResponsePair(req) From d256c5ba38ce807ff820daffd31a51efa37c3545 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 10 Jan 2018 17:34:08 -0800 Subject: [PATCH 32/55] avoid using the TODO context in tests Instead, properly create and cancel the context. (also, use subtests) License: MIT Signed-off-by: Steven Allen --- core/commands/get_test.go | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 2cf930725..929ebf569 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -2,6 +2,7 @@ package commands import ( "context" + "fmt" "testing" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" @@ -50,13 +51,19 @@ func TestGetOutputPath(t *testing.T) { t.Fatalf("error getting default command options: %v", err) } - for _, tc := range cases { - req, err := cmds.NewRequest(context.TODO(), []string{}, tc.opts, tc.args, nil, GetCmd) - if err != nil { - t.Fatalf("error creating a command request: %v", err) - } - if outPath := getOutPath(req); outPath != tc.outPath { - t.Errorf("expected outPath %s to be %s", outPath, tc.outPath) - } + for i, tc := range cases { + t.Run(fmt.Sprintf("%s-%d", t.Name(), i), func(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + req, err := cmds.NewRequest(ctx, []string{}, tc.opts, tc.args, nil, GetCmd) + if err != nil { + t.Fatalf("error creating a command request: %v", err) + } + + if outPath := getOutPath(req); outPath != tc.outPath { + t.Errorf("expected outPath %s to be %s", outPath, tc.outPath) + } + }) } } From 5583c442bffb1cb7179546904b283cbec392abe8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 10 Jan 2018 17:37:22 -0800 Subject: [PATCH 33/55] fix commands list test License: MIT Signed-off-by: Steven Allen --- core/commands/commands_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index b16a48a07..9554d7dce 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -92,6 +92,8 @@ func TestCommands(t *testing.T) { "/config/edit", "/config/replace", "/config/show", + "/config/profile", + "/config/profile/apply", "/dag", "/dag/get", "/dag/put", From 6bf29205bc236987ea2557efdf34611e1f3186cd Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jan 2018 12:39:47 -0800 Subject: [PATCH 34/55] remove progress bar size hack Compute the size in the PostCmd instead of the PreCmd. License: MIT Signed-off-by: Steven Allen --- core/commands/add.go | 48 +++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/core/commands/add.go b/core/commands/add.go index aa2b50bb1..6166a4c28 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -1,7 +1,6 @@ package commands import ( - "context" "errors" "fmt" "io" @@ -138,28 +137,6 @@ You can now check what blocks have been created by: req.Options[progressOptionName] = true } - sizeFile, ok := req.Files.(files.SizeFile) - if !ok { - // we don't need to error, the progress bar just won't know how big the files are - log.Warning("cannot determine size of input file") - return nil - } - - // HACK! Using context to pass the size to PostRun - sizeCh := make(chan int64, 1) - req.Context = context.WithValue(req.Context, "size", sizeCh) - - go func() { - size, err := sizeFile.Size() - if err != nil { - log.Warningf("error getting files size: %s", err) - // see comment above - return - } - - sizeCh <- size - }() - return nil }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { @@ -348,6 +325,27 @@ You can now check what blocks have been created by: reNext, res := cmds.NewChanResponsePair(req) outChan := make(chan interface{}) + sizeChan := make(chan int64, 1) + + sizeFile, ok := req.Files.(files.SizeFile) + if ok { + // Could be slow. + go func() { + size, err := sizeFile.Size() + if err != nil { + log.Warningf("error getting files size: %s", err) + // see comment above + return + } + + sizeChan <- size + }() + } else { + // we don't need to error, the progress bar just + // won't know how big the files are + log.Warning("cannot determine size of input file") + } + progressBar := func(wait chan struct{}) { defer close(wait) @@ -367,10 +365,6 @@ You can now check what blocks have been created by: bar.Start() } - // HACK! using context to pass size from PreRun - var sizeChan chan int64 - sizeChan, _ = req.Context.Value("size").(chan int64) - lastFile := "" lastHash := "" var totalProgress, prevFiles, lastBytes int64 From 9080a588d81f0759f225f65d71efdfb6178e1d41 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jan 2018 14:01:48 -0800 Subject: [PATCH 35/55] golint: fix variable name License: MIT Signed-off-by: Steven Allen --- core/corehttp/commands.go | 4 ++-- core/corehttp/option_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index b299a437d..5ab953ecb 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -20,7 +20,7 @@ import ( ) var ( - errApiVersionMismatch = errors.New("api version mismatch") + errAPIVersionMismatch = errors.New("api version mismatch") ) const originEnvKey = "API_ORIGIN" @@ -157,7 +157,7 @@ func CheckVersionOption() ServeOption { clientVersion := r.UserAgent() // skips check if client is not go-ipfs if clientVersion != "" && strings.Contains(clientVersion, "/go-ipfs/") && daemonVersion != clientVersion { - http.Error(w, fmt.Sprintf("%s (%s != %s)", errApiVersionMismatch, daemonVersion, clientVersion), http.StatusBadRequest) + http.Error(w, fmt.Sprintf("%s (%s != %s)", errAPIVersionMismatch, daemonVersion, clientVersion), http.StatusBadRequest) return } } diff --git a/core/corehttp/option_test.go b/core/corehttp/option_test.go index b32e2afcf..c600a0603 100644 --- a/core/corehttp/option_test.go +++ b/core/corehttp/option_test.go @@ -20,7 +20,7 @@ type testcasecheckversion struct { func (tc testcasecheckversion) body() string { if !tc.shouldHandle && tc.responseBody == "" { - return fmt.Sprintf("%s (%s != %s)\n", errApiVersionMismatch, config.ApiVersion, tc.userAgent) + return fmt.Sprintf("%s (%s != %s)\n", errAPIVersionMismatch, config.ApiVersion, tc.userAgent) } return tc.responseBody From 652ac620b149aae0d7669f96b76a0a84413c1de8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jan 2018 14:02:13 -0800 Subject: [PATCH 36/55] golint: documentation fixes License: MIT Signed-off-by: Steven Allen --- commands/request.go | 2 +- core/commands/env.go | 2 ++ core/corehttp/commands.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/commands/request.go b/commands/request.go index 0962e0080..b05c16550 100644 --- a/commands/request.go +++ b/commands/request.go @@ -65,7 +65,7 @@ func (c *Context) NodeWithoutConstructing() *core.IpfsNode { return c.node } -// RootContext returns the node's context. +// Context returns the node's context. func (c *Context) Context() context.Context { n, err := c.GetNode() if err != nil { diff --git a/core/commands/env.go b/core/commands/env.go index 42fad0ecc..d884292e3 100644 --- a/core/commands/env.go +++ b/core/commands/env.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-ipfs/repo/config" ) +// GetNode extracts the node from the environment. func GetNode(env interface{}) (*core.IpfsNode, error) { ctx, ok := env.(*commands.Context) if !ok { @@ -17,6 +18,7 @@ func GetNode(env interface{}) (*core.IpfsNode, error) { return ctx.GetNode() } +// GetConfig extracts the config from the environment. func GetConfig(env interface{}) (*config.Config, error) { ctx, ok := env.(*commands.Context) if !ok { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 5ab953ecb..b9d2efa88 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -37,6 +37,7 @@ or ipfs daemon --api-http-header 'Access-Control-Allow-Origin: *' ` +// APIPath is the path at which the API is mounted. const APIPath = "/api/v0" var defaultLocalhostOrigins = []string{ From 0e680716bd8cb5660c47de5ab556b5f9441890fe Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jan 2018 14:03:05 -0800 Subject: [PATCH 37/55] put immediate error second License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/daemon.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 65e2a8155..4a3044b5a 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -343,7 +343,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment } // construct api endpoint - every time - err, apiErrc := serveHTTPApi(req, cctx) + apiErrc, err := serveHTTPApi(req, cctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -364,7 +364,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment } // repo blockstore GC - if --enable-gc flag is present - err, gcErrc := maybeRunGC(req, node) + gcErrc, err := maybeRunGC(req, node) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -374,7 +374,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment var gwErrc <-chan error if len(cfg.Addresses.Gateway) > 0 { var err error - err, gwErrc = serveHTTPGateway(req, cctx) + gwErrc, err = serveHTTPGateway(req, cctx) if err != nil { re.SetError(err, cmdkit.ErrNormal) return @@ -396,10 +396,10 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment } // serveHTTPApi collects options, creates listener, prints status message and starts serving requests -func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) { +func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, error) { cfg, err := cctx.GetConfig() if err != nil { - return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil + return nil, fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err) } apiAddr, _ := req.Options[commands.ApiOption].(string) @@ -408,12 +408,12 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error } apiMaddr, err := ma.NewMultiaddr(apiAddr) if err != nil { - return fmt.Errorf("serveHTTPApi: invalid API address: %q (err: %s)", apiAddr, err), nil + return nil, fmt.Errorf("serveHTTPApi: invalid API address: %q (err: %s)", apiAddr, err) } apiLis, err := manet.Listen(apiMaddr) if err != nil { - return fmt.Errorf("serveHTTPApi: manet.Listen(%s) failed: %s", apiMaddr, err), nil + return nil, fmt.Errorf("serveHTTPApi: manet.Listen(%s) failed: %s", apiMaddr, err) } // we might have listened to /tcp/0 - lets see what we are listing on apiMaddr = apiLis.Multiaddr() @@ -448,11 +448,11 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error node, err := cctx.ConstructNode() if err != nil { - return fmt.Errorf("serveHTTPApi: ConstructNode() failed: %s", err), nil + return nil, fmt.Errorf("serveHTTPApi: ConstructNode() failed: %s", err) } if err := node.Repo.SetAPIAddr(apiMaddr); err != nil { - return fmt.Errorf("serveHTTPApi: SetAPIAddr() failed: %s", err), nil + return nil, fmt.Errorf("serveHTTPApi: SetAPIAddr() failed: %s", err) } errc := make(chan error) @@ -460,7 +460,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error errc <- corehttp.Serve(node, apiLis.NetListener(), opts...) close(errc) }() - return nil, errc + return errc, nil } // printSwarmAddrs prints the addresses of the host @@ -495,15 +495,15 @@ func printSwarmAddrs(node *core.IpfsNode) { } // serveHTTPGateway collects options, creates listener, prints status message and starts serving requests -func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) { +func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, error) { cfg, err := cctx.GetConfig() if err != nil { - return fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err), nil + return nil, fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err) } gatewayMaddr, err := ma.NewMultiaddr(cfg.Addresses.Gateway) if err != nil { - return fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err), nil + return nil, fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err) } writable, writableOptionFound := req.Options[writableKwd].(bool) @@ -513,7 +513,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e gwLis, err := manet.Listen(gatewayMaddr) if err != nil { - return fmt.Errorf("serveHTTPGateway: manet.Listen(%s) failed: %s", gatewayMaddr, err), nil + return nil, fmt.Errorf("serveHTTPGateway: manet.Listen(%s) failed: %s", gatewayMaddr, err) } // we might have listened to /tcp/0 - lets see what we are listing on gatewayMaddr = gwLis.Multiaddr() @@ -539,7 +539,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e node, err := cctx.ConstructNode() if err != nil { - return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil + return nil, fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err) } errc := make(chan error) @@ -547,7 +547,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e errc <- corehttp.Serve(node, gwLis.NetListener(), opts...) close(errc) }() - return nil, errc + return errc, nil } //collects options and opens the fuse mountpoint @@ -581,7 +581,7 @@ func mountFuse(req *cmds.Request, cctx *oldcmds.Context) error { return nil } -func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (error, <-chan error) { +func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (<-chan error, error) { enableGC, _ := req.Options[enableGCKwd].(bool) if !enableGC { return nil, nil @@ -592,7 +592,7 @@ func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (error, <-chan error) { errc <- corerepo.PeriodicGC(req.Context, node) close(errc) }() - return nil, errc + return errc, nil } // merge does fan-in of multiple read-only error channels From 0bdc2574ce27e0cce0c1c3cad766f87645aa0740 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jan 2018 15:35:24 -0800 Subject: [PATCH 38/55] update go-ipfs-cmds Fix a nil pointer exception when no timeout is set and an HTTP request fails. License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 4 ++-- 29 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 4a3044b5a..5e1626075 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -26,8 +26,8 @@ import ( ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) const ( diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 38fa59427..6938157f3 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 88e5a1913..38ecf3468 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -33,9 +33,9 @@ import ( loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/cli" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/cli" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/http" ) // log is the command logger diff --git a/commands/command.go b/commands/command.go index 769dca39c..049102020 100644 --- a/commands/command.go +++ b/commands/command.go @@ -18,7 +18,7 @@ import ( logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 37ddb6987..11c56e8de 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -4,7 +4,7 @@ import ( "testing" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 055ac3d0d..0736e4a9e 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 449eccb75..e31ba03e8 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index 202de38c9..c887b71bd 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -8,7 +8,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 0005176a6..b635fe0df 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -9,7 +9,7 @@ import ( "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index 64ef34850..e9b6b87a3 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -8,7 +8,7 @@ import ( "sync" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index b05c16550..50acb95da 100644 --- a/commands/request.go +++ b/commands/request.go @@ -18,7 +18,7 @@ import ( "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 114136755..3da78b660 100644 --- a/commands/response.go +++ b/commands/response.go @@ -10,7 +10,7 @@ import ( "strings" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index 2a6c84d9f..c4a9f66c0 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -7,7 +7,7 @@ import ( "testing" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 6166a4c28..31301eb0d 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -20,8 +20,8 @@ import ( mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // ErrDepthLimitExceeded indicates that the max depth has been exceded. diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index e0dd6a227..a59323ccd 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -14,8 +14,8 @@ import ( "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var BitswapCmd = &cmds.Command{ diff --git a/core/commands/block.go b/core/commands/block.go index eee1d6e87..89aff334a 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -14,8 +14,8 @@ import ( mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type BlockStat struct { diff --git a/core/commands/cat.go b/core/commands/cat.go index 80e51c234..714557134 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -10,7 +10,7 @@ import ( coreunix "github.com/ipfs/go-ipfs/core/coreunix" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index d50a9e32e..04c2f045d 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -14,7 +14,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 9554d7dce..4120ca387 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 916f8d439..e61a3d9b0 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -13,8 +13,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var FileStoreCmd = &cmds.Command{ diff --git a/core/commands/get.go b/core/commands/get.go index 0aae7f7c1..c8d1deef1 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -17,8 +17,8 @@ import ( uarchive "github.com/ipfs/go-ipfs/unixfs/archive" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var ErrInvalidCompressionLevel = errors.New("Compression level must be between 1 and 9") diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 929ebf569..11576488f 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -6,7 +6,7 @@ import ( "testing" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index d3ea78d7e..daac2ad1a 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 84f6670ae..49d977738 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -15,8 +15,8 @@ import ( pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var PubsubCmd = &cmds.Command{ diff --git a/core/commands/repo.go b/core/commands/repo.go index b2e419347..4e16aecd6 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,8 +19,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type RepoVersion struct { diff --git a/core/commands/root.go b/core/commands/root.go index 03a10f803..0b2371c03 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -14,7 +14,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 1350be497..8cb93aa57 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -12,7 +12,7 @@ import ( protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var StatsCmd = &cmds.Command{ diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index b9d2efa88..f918fd084 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" + cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 77ea65efb..49ce43276 100644 --- a/package.json +++ b/package.json @@ -414,9 +414,9 @@ "version": "2.1.2" }, { - "hash": "QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM", + "hash": "QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG", "name": "go-ipfs-cmds", - "version": "1.0.0" + "version": "1.0.1" }, { "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM", From 176d15656d95edf7d60e7944cdc32349a95a1263 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Thu, 18 Jan 2018 21:52:48 -0800 Subject: [PATCH 39/55] update go-ipfs-cmds, fix context closing issue License: MIT Signed-off-by: Jeromy --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 2 +- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 4 ++-- 29 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 5e1626075..97007b1f4 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -23,10 +23,10 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" ) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 6938157f3..be692f2f1 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 38ecf3468..d8e6a2678 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,11 +31,11 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds/cli" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/cli" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/http" ) // log is the command logger diff --git a/commands/command.go b/commands/command.go index 049102020..383e6aedf 100644 --- a/commands/command.go +++ b/commands/command.go @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-ipfs/path" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 11c56e8de..f74f0e0be 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index 0736e4a9e..2196cb6f0 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index e31ba03e8..de44d7bda 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index c887b71bd..8cfc51761 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index b635fe0df..a887e4ae2 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index e9b6b87a3..481e1ff2c 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 50acb95da..242b623d1 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type Context struct { diff --git a/commands/response.go b/commands/response.go index 3da78b660..f01cb0d75 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index c4a9f66c0..c65bd3572 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 31301eb0d..aad7fd37d 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -17,10 +17,10 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index a59323ccd..c511a1e9c 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,9 +12,9 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/block.go b/core/commands/block.go index 89aff334a..c1b20a1be 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,10 +11,10 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/cat.go b/core/commands/cat.go index 714557134..63a730717 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/commands.go b/core/commands/commands.go index 04c2f045d..fbce892d6 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -13,8 +13,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) type commandEncoder struct { diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 4120ca387..50176a7ce 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index e61a3d9b0..1dd14b5a0 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/get.go b/core/commands/get.go index c8d1deef1..6a8385201 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,8 +16,8 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index 11576488f..8f5acb579 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index daac2ad1a..87f1e2a0e 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 49d977738..9b716a01e 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,10 +12,10 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index 4e16aecd6..1397aa82a 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,8 +18,8 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" ) diff --git a/core/commands/root.go b/core/commands/root.go index 0b2371c03..0d66464cb 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -13,8 +13,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 8cb93aa57..2cd0c7bee 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,11 +8,11 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" ) var StatsCmd = &cmds.Command{ diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index f918fd084..b25a96b33 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG/go-ipfs-cmds/http" + cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 49ce43276..307d51515 100644 --- a/package.json +++ b/package.json @@ -414,9 +414,9 @@ "version": "2.1.2" }, { - "hash": "QmeQHu2YxKwgyThinyW7S3GtebRToQcxQKqxNQaRBBGzuG", + "hash": "QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9", "name": "go-ipfs-cmds", - "version": "1.0.1" + "version": "1.0.2" }, { "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM", From a17f8c0e1726004028c7202b375fdfddcf8180c8 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 21 Jan 2018 11:14:26 -0800 Subject: [PATCH 40/55] fix changes from recent commands License: MIT Signed-off-by: Jeromy --- core/commands/cat.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/commands/cat.go b/core/commands/cat.go index 63a730717..e65d27eae 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -48,7 +48,7 @@ var CatCmd = &cmds.Command{ return } - max, found, err := req.Option("length").Int() + max, found := req.Options["length"].(int) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -67,7 +67,7 @@ var CatCmd = &cmds.Command{ return } - readers, length, err := cat(req.Context(), node, req.Arguments(), int64(offset), int64(max)) + readers, length, err := cat(req.Context, node, req.Arguments, int64(offset), int64(max)) if err != nil { res.SetError(err, cmdkit.ErrNormal) return From e00f903c82d39bb75d6739bdc09e0fc1c248a856 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 20 Jan 2018 00:31:06 -0800 Subject: [PATCH 41/55] return background context instead of nil License: MIT Signed-off-by: Steven Allen --- commands/request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/request.go b/commands/request.go index 242b623d1..018e8469f 100644 --- a/commands/request.go +++ b/commands/request.go @@ -70,7 +70,7 @@ func (c *Context) Context() context.Context { n, err := c.GetNode() if err != nil { log.Debug("error getting node: ", err) - return nil + return context.Background() } return n.Context() From 9cc6285be1c4756d0d2e12dbeca7d00f3f2c21c8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 20 Jan 2018 00:33:26 -0800 Subject: [PATCH 42/55] remove debugging print statement License: MIT Signed-off-by: Steven Allen --- core/commands/files/files.go | 1 - 1 file changed, 1 deletion(-) diff --git a/core/commands/files/files.go b/core/commands/files/files.go index 861972c17..db53a5b26 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -236,7 +236,6 @@ var FilesCpCmd = &cmds.Command{ } flush, _, _ := req.Option("flush").Bool() - fmt.Println("flush:", flush) src, err := checkPath(req.Arguments()[0]) if err != nil { From 888c5fc437555444672681ac5b1dfa049a93fa47 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 20 Jan 2018 00:51:13 -0800 Subject: [PATCH 43/55] remove useless cast License: MIT Signed-off-by: Steven Allen --- core/commands/filestore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/commands/filestore.go b/core/commands/filestore.go index 1dd14b5a0..a4347a452 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -54,7 +54,7 @@ The output is: cmdkit.BoolOption("file-order", "sort the results based on the path of the backing file"), }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { - _, fs, err := getFilestore(env.(*oldCmds.Context)) + _, fs, err := getFilestore(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) return From 2f964d40e8519dd7bb6447eb7e7084da0be9592c Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 20 Jan 2018 00:55:52 -0800 Subject: [PATCH 44/55] forbid bad compression levels (instead of allowing -1 and treating it as "use default") License: MIT Signed-off-by: Steven Allen --- core/commands/get.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/commands/get.go b/core/commands/get.go index 6a8385201..27a052f1e 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -46,7 +46,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. cmdkit.StringOption("output", "o", "The path where the output should be stored."), cmdkit.BoolOption("archive", "a", "Output a TAR archive."), cmdkit.BoolOption("compress", "C", "Compress the output with GZIP compression."), - cmdkit.IntOption("compression-level", "l", "The level of compression (1-9).").WithDefault(-1), + cmdkit.IntOption("compression-level", "l", "The level of compression (1-9)."), }, PreRun: func(req *cmds.Request, env cmds.Environment) error { _, err := getCompressOptions(req) @@ -257,11 +257,11 @@ func (gw *getWriter) writeExtracted(r io.Reader, fpath string) error { func getCompressOptions(req *cmds.Request) (int, error) { cmprs, _ := req.Options["compress"].(bool) - cmplvl, _ := req.Options["compression-level"].(int) + cmplvl, cmplvlFound := req.Options["compression-level"].(int) switch { case !cmprs: return gzip.NoCompression, nil - case cmprs && cmplvl == -1: + case cmprs && !cmplvlFound: return gzip.DefaultCompression, nil case cmprs && (cmplvl < 1 || cmplvl > 9): return gzip.NoCompression, ErrInvalidCompressionLevel From fcef972cda71096f53b30fc3899d7645b816f9fa Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 12:01:26 -0800 Subject: [PATCH 45/55] restore call to getOutPath function It strips the last `/` which was part of a partial fix for #3729. Unfortunately, it's not a *real* fix but we might as well leave this as it is until we completely fix it. License: MIT Signed-off-by: Steven Allen --- core/commands/get.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/commands/get.go b/core/commands/get.go index 27a052f1e..13b9bf445 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -119,11 +119,7 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } - outPath, _ := req.Options["output"].(string) - if len(outPath) == 0 { - _, outPath = gopath.Split(req.Arguments[0]) - outPath = gopath.Clean(outPath) - } + outPath := getOutPath(req) cmplvl, err := getCompressOptions(req) if err != nil { From 4909c5a56d256e0b999d11b065227b94576609ce Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 12:30:55 -0800 Subject: [PATCH 46/55] correctly handle add flag constraints License: MIT Signed-off-by: Steven Allen --- core/commands/add.go | 75 +++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/core/commands/add.go b/core/commands/add.go index aad7fd37d..f4c6d0aee 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -114,11 +114,11 @@ You can now check what blocks have been created by: cmdkit.BoolOption(hiddenOptionName, "H", "Include files that are hidden. Only takes effect on recursive add."), cmdkit.StringOption(chunkerOptionName, "s", "Chunking algorithm, size-[bytes] or rabin-[min]-[avg]-[max]").WithDefault("size-262144"), cmdkit.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true), - cmdkit.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. (experimental)"), - cmdkit.BoolOption(noCopyOptionName, "Add the file using filestore. (experimental)"), + cmdkit.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. Implies CIDv1, defaults to on if CIDv1 is enabled. (experimental)"), + cmdkit.BoolOption(noCopyOptionName, "Add the file using filestore. Implies raw-leaves. (experimental)"), cmdkit.BoolOption(fstoreCacheOptionName, "Check the filestore for pre-existing blocks. (experimental)"), - cmdkit.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").WithDefault(0), - cmdkit.StringOption(hashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)").WithDefault("sha2-256"), + cmdkit.IntOption(cidVersionOptionName, "CID version. Defaults to 0 unless an option that depends on CIDv1 is passed. (experimental)"), + cmdkit.StringOption(hashOptionName, "Hash function to use. Implies CIDv1 if not sha2-256. (experimental)").WithDefault("sha2-256"), }, PreRun: func(req *cmds.Request, env cmds.Environment) error { quiet, _ := req.Options[quietOptionName].(bool) @@ -170,33 +170,72 @@ You can now check what blocks have been created by: rawblks, rbset := req.Options[rawLeavesOptionName].(bool) nocopy, _ := req.Options[noCopyOptionName].(bool) fscache, _ := req.Options[fstoreCacheOptionName].(bool) - cidVer, _ := req.Options[cidVersionOptionName].(int) - hashFunStr, hfset := req.Options[hashOptionName].(string) + cidVer, cidVerSet := req.Options[cidVersionOptionName].(int) + hashFunStr, _ := req.Options[hashOptionName].(string) + // Given the following constraints: + // + // nocopy -> filestoreEnabled + // nocopy -> rawblocks + // rawblocks -> cidv1 + // (hash != sha2-256) -> cidv1 + // + // We solve for the values of rawblocks and cidv1 in the + // following order of preference: + // + // 1. If cidv1 isn't fixed, set it to false and try solving. + // 2. If rawblocks isn't fixed, set it to true and try solving. + // + // If neither solution works, give up (we have a conflict). + + // nocopy -> filestorEnabled if nocopy && !cfg.Experimental.FilestoreEnabled { res.SetError(errors.New("filestore is not enabled, see https://git.io/vy4XN"), cmdkit.ErrClient) return } - if hfset && hashFunStr != "sha2-256" && cidVer == 0 { - cidVer = 1 + // nocopy -> rawblocks + if nocopy && !rawblks { + // fixed? + if rbset { + res.SetError( + fmt.Errorf("nocopy option requires '--raw-leaves' to be enabled as well"), + cmdkit.ErrNormal, + ) + return + } + // No, satisfy mandatory constraint. + rawblks = true } + if !cidVerSet { + // Default to CIDv0 if possible. + // Conditions: no raw blocks, sha2-256 + if hashFunStr == "sha2-256" && !rawblks { + cidVer = 0 + } else { + cidVer = 1 + } + } else if cidVer == 0 { + // CIDv0 *was* set... + if hashFunStr != "sha2-256" { + res.SetError(errors.New("CIDv0 only supports sha2-256"), cmdkit.ErrClient) + return + } else if rawblks { + res.SetError( + errors.New("CIDv0 incompatible with raw-leaves and/or nocopy"), + cmdkit.ErrClient, + ) + return + } + } + + // cidV1 -> raw blocks (by default) if cidVer > 0 && !rbset { rawblks = true } - // if rawblocks is not explicitly set but nocopy is, set rawblocks - if nocopy && !rbset { - rawblks = true - } - - if nocopy && !rawblks { - res.SetError(fmt.Errorf("nocopy option requires '--raw-leaves' to be enabled as well"), cmdkit.ErrNormal) - return - } - prefix, err := dag.PrefixForCidVersion(cidVer) if err != nil { res.SetError(err, cmdkit.ErrNormal) From 4e796fd9a85542d8ae35e4c6c5119a67af8b87c4 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 12:34:15 -0800 Subject: [PATCH 47/55] remove todo file License: MIT Signed-off-by: Steven Allen --- TODO.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 TODO.md diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 6ebfcaf57..000000000 --- a/TODO.md +++ /dev/null @@ -1,2 +0,0 @@ -# TODO before merge - From 61b1d2f258f0d73ccbb038b998afe5e7893bb88c Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 19:59:21 -0800 Subject: [PATCH 48/55] remove todo I've looked into this and I agree, Online was always false (and should be in this case, anyways). License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/main.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index d8e6a2678..7b8b68b6c 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -131,9 +131,6 @@ func mainRet() int { // ok everything is good. set it on the invocation (for ownership) // and return it. n, err = core.NewNode(ctx, &core.BuildCfg{ - // TODO(keks) figure out how Online was set before. I think it was set to - // a value that always is the zero value so we can just drop it, but - // I'll have to check that. Repo: r, }) if err != nil { From 31bb782e77bba47c04f65910a280d005e409e96d Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 20:04:45 -0800 Subject: [PATCH 49/55] fix code-climate issues License: MIT Signed-off-by: Steven Allen --- commands/legacy/legacy.go | 2 ++ core/corehttp/commands.go | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index de44d7bda..513c16496 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -45,6 +45,8 @@ func (me *MarshalerEncoder) Encode(v interface{}) error { return err } +// OldContext tries to cast the environment as a legacy command context, +// returning nil on failure. func OldContext(env interface{}) *oldcmds.Context { ctx, ok := env.(*oldcmds.Context) if !ok { diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index b25a96b33..60be1b1f7 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -134,10 +134,14 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { } } +// CommandsOption constructs a ServerOption for hooking the commands into the +// HTTP server. func CommandsOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.Root) } +// CommandsOption constructs a ServerOption for hooking the read-only commands +// into the HTTP server. func CommandsROOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) } From 418bb65d9db9fa26482344be5d4faa03b9a4c29a Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 20:27:15 -0800 Subject: [PATCH 50/55] fix doc comment on CommandsROOption License: MIT Signed-off-by: Steven Allen --- core/corehttp/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 60be1b1f7..96cc28e9f 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -140,7 +140,7 @@ func CommandsOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.Root) } -// CommandsOption constructs a ServerOption for hooking the read-only commands +// CommandsROOption constructs a ServerOption for hooking the read-only commands // into the HTTP server. func CommandsROOption(cctx oldcmds.Context) ServeOption { return commandsOption(cctx, corecommands.RootRO) From 5127ef497049f3e1dcdb1285cef4865c04c46a81 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 21:42:58 -0800 Subject: [PATCH 51/55] remove rawblocks -> cidv1 constraint on add command We probably should have this but it's a breaking change. License: MIT Signed-off-by: Steven Allen --- core/commands/add.go | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/core/commands/add.go b/core/commands/add.go index f4c6d0aee..3b9933a00 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -114,7 +114,7 @@ You can now check what blocks have been created by: cmdkit.BoolOption(hiddenOptionName, "H", "Include files that are hidden. Only takes effect on recursive add."), cmdkit.StringOption(chunkerOptionName, "s", "Chunking algorithm, size-[bytes] or rabin-[min]-[avg]-[max]").WithDefault("size-262144"), cmdkit.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true), - cmdkit.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. Implies CIDv1, defaults to on if CIDv1 is enabled. (experimental)"), + cmdkit.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. (experimental)"), cmdkit.BoolOption(noCopyOptionName, "Add the file using filestore. Implies raw-leaves. (experimental)"), cmdkit.BoolOption(fstoreCacheOptionName, "Check the filestore for pre-existing blocks. (experimental)"), cmdkit.IntOption(cidVersionOptionName, "CID version. Defaults to 0 unless an option that depends on CIDv1 is passed. (experimental)"), @@ -173,22 +173,15 @@ You can now check what blocks have been created by: cidVer, cidVerSet := req.Options[cidVersionOptionName].(int) hashFunStr, _ := req.Options[hashOptionName].(string) - // Given the following constraints: + // The arguments are subject to the following constraints. // // nocopy -> filestoreEnabled // nocopy -> rawblocks - // rawblocks -> cidv1 // (hash != sha2-256) -> cidv1 - // - // We solve for the values of rawblocks and cidv1 in the - // following order of preference: - // - // 1. If cidv1 isn't fixed, set it to false and try solving. - // 2. If rawblocks isn't fixed, set it to true and try solving. - // - // If neither solution works, give up (we have a conflict). - // nocopy -> filestorEnabled + // NOTE: 'rawblocks -> cidv1' is missing. Legacy reasons. + + // nocopy -> filestoreEnabled if nocopy && !cfg.Experimental.FilestoreEnabled { res.SetError(errors.New("filestore is not enabled, see https://git.io/vy4XN"), cmdkit.ErrClient) @@ -209,26 +202,16 @@ You can now check what blocks have been created by: rawblks = true } - if !cidVerSet { - // Default to CIDv0 if possible. - // Conditions: no raw blocks, sha2-256 - if hashFunStr == "sha2-256" && !rawblks { - cidVer = 0 - } else { - cidVer = 1 - } - } else if cidVer == 0 { - // CIDv0 *was* set... - if hashFunStr != "sha2-256" { - res.SetError(errors.New("CIDv0 only supports sha2-256"), cmdkit.ErrClient) - return - } else if rawblks { + // (hash != "sha2-256") -> CIDv1 + if hashFunStr != "sha2-256" && cidVer == 0 { + if cidVerSet { res.SetError( - errors.New("CIDv0 incompatible with raw-leaves and/or nocopy"), + errors.New("CIDv0 only supports sha2-256"), cmdkit.ErrClient, ) return } + cidVer = 1 } // cidV1 -> raw blocks (by default) From 8892bbf2c6bbddb87a755e4f1ba93c372765cb11 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 22:18:16 -0800 Subject: [PATCH 52/55] fix add-and-cat test: we no longer set a default CIDv0 Instead, we choose it based on whether or not we can actually support CIDv0. License: MIT Signed-off-by: Steven Allen --- test/sharness/t0040-add-and-cat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh index c4a05a7fe..80c20eff4 100755 --- a/test/sharness/t0040-add-and-cat.sh +++ b/test/sharness/t0040-add-and-cat.sh @@ -554,7 +554,7 @@ test_add_cat_expensive "--cid-version=1" "zdj7WcatQrtuE4WMkS4XsfsMixuQN2po4irkYh # encoded with the blake2b-256 hash funtion test_add_cat_expensive '--hash=blake2b-256' "zDMZof1kwndounDzQCANUHjiE3zt1mPEgx7RE3JTHoZrRRa79xcv" -test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&cid-version=0&encoding=json&hash=sha2-256&pin=true&progress=true&recursive=true&stream-channels=true:" +test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&encoding=json&hash=sha2-256&pin=true&progress=true&recursive=true&stream-channels=true:" test_add_pwd_is_symlink From 20a044e38305fb6000c20be74a438c05a710e159 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 23:36:47 -0800 Subject: [PATCH 53/55] fix a race and a potential race in http options License: MIT Signed-off-by: Steven Allen --- core/corehttp/commands.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 96cc28e9f..e1d4bfd3b 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -73,7 +73,13 @@ func addHeadersFromConfig(c *cmdsHttp.ServerConfig, nc *config.Config) { } } - c.Headers = nc.API.HTTPHeaders + c.Headers = make(map[string][]string, len(nc.API.HTTPHeaders)) + + // Copy these because the config is shared and this function is called + // in multiple places concurrently. Updating these in-place *is* racy. + for h, v := range nc.API.HTTPHeaders { + c.Headers[h] = v + } c.Headers["Server"] = []string{"go-ipfs/" + config.CurrentVersionNumber} } @@ -101,15 +107,16 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) { } // we're listening on tcp/udp with ports. ("udp!?" you say? yeah... it happens...) - origins := c.AllowedOrigins() - for i, o := range origins { + oldOrigins := c.AllowedOrigins() + newOrigins := make([]string, len(oldOrigins)) + for i, o := range oldOrigins { // TODO: allow replacing . tricky, ip4 and ip6 and hostnames... if port != "" { o = strings.Replace(o, "", port, -1) } - origins[i] = o + newOrigins[i] = o } - c.SetAllowedOrigins(origins...) + c.SetAllowedOrigins(newOrigins...) } func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { From a784589d2aa9a57e22903c7c0850c0d2436928a5 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 23 Jan 2018 23:36:51 -0800 Subject: [PATCH 54/55] don't set origins twice ... License: MIT Signed-off-by: Steven Allen --- core/corehttp/commands.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index e1d4bfd3b..9dfdfe70a 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -51,9 +51,6 @@ func addCORSFromEnv(c *cmdsHttp.ServerConfig) { origin := os.Getenv(originEnvKey) if origin != "" { log.Warning(originEnvKeyDeprecate) - if len(c.AllowedOrigins()) == 0 { - c.SetAllowedOrigins([]string{origin}...) - } c.AppendAllowedOrigins(origin) } } From a10d1f46dd1d1b9fb3256f02275f15861007194d Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 24 Jan 2018 12:37:26 -0800 Subject: [PATCH 55/55] fix stats bw --poll output License: MIT Signed-off-by: Jeromy --- core/commands/stat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/commands/stat.go b/core/commands/stat.go index 2cd0c7bee..1cf5f4a0c 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -171,7 +171,7 @@ Example: fmt.Fprintf(os.Stdout, "%8s ", humanize.Bytes(uint64(bs.TotalOut))) fmt.Fprintf(os.Stdout, "%8s ", humanize.Bytes(uint64(bs.TotalIn))) fmt.Fprintf(os.Stdout, "%8s/s ", humanize.Bytes(uint64(bs.RateOut))) - fmt.Fprintf(os.Stdout, "%8s/s \n", humanize.Bytes(uint64(bs.RateIn))) + fmt.Fprintf(os.Stdout, "%8s/s \r", humanize.Bytes(uint64(bs.RateIn))) } }()