cmds/bitswap: sort wantlist

License: MIT
Signed-off-by: Overbool <overbool.xu@gmail.com>

core/commands/bitswap.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"io"
+	"sort"
 
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
@@ -64,18 +65,24 @@ Print out all blocks currently on the bitswap wantlist for the local peer.`,
 			if err != nil {
 				return err
 			}
-			if pid == nd.Identity {
-				return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
+			if pid != nd.Identity {
+				return cmds.EmitOnce(res, &KeyList{bs.WantlistForPeer(pid)})
 			}
-
-			return cmds.EmitOnce(res, &KeyList{bs.WantlistForPeer(pid)})
 		}
+
 		return cmds.EmitOnce(res, &KeyList{bs.GetWantlist()})
 	},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *KeyList) error {
+			// sort the keys first
+			keys := make([]string, 0, len(out.Keys))
 			for _, key := range out.Keys {
-				fmt.Fprintln(w, key.String())
+				keys = append(keys, key.String())
+			}
+			sort.Sort(sort.StringSlice(keys))
+
+			for _, key := range keys {
+				fmt.Fprintln(w, key)
 			}
 
 			return nil