Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

commands/bitswap: use new cmds lib #5676

Merged
merged 2 commits into from Nov 6, 2018
Merged

commands/bitswap: use new cmds lib #5676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b44de
commands/bitswap: use new cmds lib
overbool Oct 27, 2018
73fef48
commands/bitswap: use cmds.EmitOnce in single value
overbool Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
117 changes: 46 additions & 71 deletions core/commands/bitswap.go
View file
Open in desktop
@@ -1,18 +1,15 @@
package commands

import (
"bytes"
"fmt"
"io"

oldcmds "github.com/ipfs/go-ipfs/commands"
lgc "github.com/ipfs/go-ipfs/commands/legacy"
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
e "github.com/ipfs/go-ipfs/core/commands/e"

humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
bitswap "gx/ipfs/QmXRphxBT4BH2GqGHUSbqULm7wNsxnpA2NrbNaY3DU1Y5K/go-bitswap"
decision "gx/ipfs/QmXRphxBT4BH2GqGHUSbqULm7wNsxnpA2NrbNaY3DU1Y5K/go-bitswap/decision"

"gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
Expand All @@ -26,17 +23,17 @@ var BitswapCmd = &cmds.Command{

Subcommands: map[string]*cmds.Command{
"stat": bitswapStatCmd,
"wantlist": lgc.NewCommand(showWantlistCmd),
"ledger": lgc.NewCommand(ledgerCmd),
"reprovide": lgc.NewCommand(reprovideCmd),
"wantlist": showWantlistCmd,
"ledger": ledgerCmd,
"reprovide": reprovideCmd,
},
}

const (
peerOptionName = "peer"
)

var showWantlistCmd = &oldcmds.Command{
var showWantlistCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Show blocks currently on the wantlist.",
ShortDescription: `
Expand All @@ -46,47 +43,43 @@ Print out all blocks currently on the bitswap wantlist for the local peer.`,
cmdkit.StringOption(peerOptionName, "p", "Specify which peer to show wantlist for. Default: self."),
},
Type: KeyList{},
Run: func(req oldcmds.Request, res oldcmds.Response) {
nd, err := req.InvocContext().GetNode()
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
nd, err := cmdenv.GetNode(env)
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
return err
}

if !nd.OnlineMode() {
res.SetError(ErrNotOnline, cmdkit.ErrClient)
return
return ErrNotOnline
}

bs, ok := nd.Exchange.(*bitswap.Bitswap)
if !ok {
res.SetError(e.TypeErr(bs, nd.Exchange), cmdkit.ErrNormal)
return
return e.TypeErr(bs, nd.Exchange)
}

pstr, found, err := req.Option(peerOptionName).String()
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
}
pstr, found := req.Options[peerOptionName].(string)
if found {
pid, err := peer.IDB58Decode(pstr)
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
return err
}
if pid == nd.Identity {
res.SetOutput(&KeyList{bs.GetWantlist()})
return
return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
}

res.SetOutput(&KeyList{bs.WantlistForPeer(pid)})
} else {
res.SetOutput(&KeyList{bs.GetWantlist()})
return cmds.EmitOnce(res, &KeyList{bs.WantlistForPeer(pid)})
}
return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
},
Marshalers: oldcmds.MarshalerMap{
oldcmds.Text: KeyListTextMarshaler,
Encoders: cmds.EncoderMap{
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *KeyList) error {
for _, key := range out.Keys {
fmt.Fprintln(w, key.String())
}

return nil
}),
},
}

Expand Down Expand Up @@ -147,7 +140,7 @@ var bitswapStatCmd = &cmds.Command{
},
}

var ledgerCmd = &oldcmds.Command{
var ledgerCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Show the current ledger for a peer.",
ShortDescription: `
Expand All @@ -160,81 +153,63 @@ prints the ledger associated with a given peer.
cmdkit.StringArg("peer", true, false, "The PeerID (B58) of the ledger to inspect."),
},
Type: decision.Receipt{},
Run: func(req oldcmds.Request, res oldcmds.Response) {
nd, err := req.InvocContext().GetNode()
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
nd, err := cmdenv.GetNode(env)
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
return err
}

if !nd.OnlineMode() {
res.SetError(ErrNotOnline, cmdkit.ErrClient)
return
return ErrNotOnline
}

bs, ok := nd.Exchange.(*bitswap.Bitswap)
if !ok {
res.SetError(e.TypeErr(bs, nd.Exchange), cmdkit.ErrNormal)
return
return e.TypeErr(bs, nd.Exchange)
}

partner, err := peer.IDB58Decode(req.Arguments()[0])
partner, err := peer.IDB58Decode(req.Arguments[0])
if err != nil {
res.SetError(err, cmdkit.ErrClient)
return
return err
}
res.SetOutput(bs.LedgerForPeer(partner))
return cmds.EmitOnce(res, bs.LedgerForPeer(partner))
},
Marshalers: oldcmds.MarshalerMap{
oldcmds.Text: func(res oldcmds.Response) (io.Reader, error) {
v, err := unwrapOutput(res.Output())
if err != nil {
return nil, err
}

out, ok := v.(*decision.Receipt)
if !ok {
return nil, e.TypeErr(out, v)
}

buf := new(bytes.Buffer)
fmt.Fprintf(buf, "Ledger for %s\n"+
Encoders: cmds.EncoderMap{
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *decision.Receipt) error {
fmt.Fprintf(w, "Ledger for %s\n"+
"Debt ratio:\t%f\n"+
"Exchanges:\t%d\n"+
"Bytes sent:\t%d\n"+
"Bytes received:\t%d\n\n",
out.Peer, out.Value, out.Exchanged,
out.Sent, out.Recv)
return buf, nil
},
return nil
}),
},
}

var reprovideCmd = &oldcmds.Command{
var reprovideCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Trigger reprovider.",
ShortDescription: `
Trigger reprovider to announce our data to network.
`,
},
Run: func(req oldcmds.Request, res oldcmds.Response) {
nd, err := req.InvocContext().GetNode()
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
nd, err := cmdenv.GetNode(env)
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
return err
}

if !nd.OnlineMode() {
res.SetError(ErrNotOnline, cmdkit.ErrClient)
return
return ErrNotOnline
}

err = nd.Reprovider.Trigger(req.Context())
err = nd.Reprovider.Trigger(req.Context)
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
return err
}

res.SetOutput(nil)
return nil
},
}