cmds/bitswap: sort wantlist
License: MIT Signed-off-by: Overbool <overbool.xu@gmail.com>
Overbool committed
Nov 10, 2018 at 10:22 UTC
f4976e6b4e36ab5434bf951ca56b53815d441883
1 file changed
+7
-5
core/commands/bitswap.go
+7
-5
@@ -11,6 +11,7 @@ import (
11
bitswap "gx/ipfs/QmXRphxBT4BH2GqGHUSbqULm7wNsxnpA2NrbNaY3DU1Y5K/go-bitswap"
12
decision "gx/ipfs/QmXRphxBT4BH2GqGHUSbqULm7wNsxnpA2NrbNaY3DU1Y5K/go-bitswap/decision"
13
cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
14
+ cidutil "gx/ipfs/QmbfKu17LbMWyGUxHEUns9Wf5Dkm8PT6be4uPhTkk4YvaV/go-cidutil"
15
peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
16
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
17
)
@@ -64,18 +65,19 @@ Print out all blocks currently on the bitswap wantlist for the local peer.`,
65
if err != nil {
66
return err
67
}
67
- if pid == nd.Identity {
68
- return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
68
+ if pid != nd.Identity {
69
+ return cmds.EmitOnce(res, &KeyList{bs.WantlistForPeer(pid)})
70
}
70
-
71
- return cmds.EmitOnce(res, &KeyList{bs.WantlistForPeer(pid)})
71
}
72
+
73
return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
74
},
75
Encoders: cmds.EncoderMap{
76
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *KeyList) error {
77
+ // sort the keys first
78
+ cidutil.Sort(out.Keys)
79
for _, key := range out.Keys {
78
- fmt.Fprintln(w, key.String())
80
+ fmt.Fprintln(w, key)
81
}
82
83
return nil