coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-03 15:27:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #7397 from ipfs/fix/id-addr-format

Browse Source 
fix(commands): print consistent addresses in ipfs id
This commit is contained in:
Steven Allen 2020-06-02 10:46:28 -07:00 committed by GitHub
commit 22dc1ad397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/commands/id.go
View File

@ -154,7 +154,13 @@ func printPeer(ps pstore.Peerstore, p peer.ID) (interface{}, error) {
info.PublicKey = base64.StdEncoding.EncodeToString(pkb)
}
for _, a := range ps.Addrs(p) {
addrInfo := ps.PeerInfo(p)
addrs, err := peer.AddrInfoToP2pAddrs(&addrInfo)
if err != nil {
return nil, err
}
for _, a := range addrs {
info.Addresses = append(info.Addresses, a.String())
}

19
test/sharness/t0140-swarm.sh
View File

@ -123,6 +123,25 @@ test_expect_success "/p2p addresses work" '
[ $(ipfsi 0 swarm peers | wc -l) -eq 1 ]
'
test_expect_success "ipfs id is consistent for node 0" '
ipfsi 1 id "$(iptb attr get 0 id)" > 1see0 &&
ipfsi 0 id > 0see0 &&
test_cmp 1see0 0see0
'
test_expect_success "ipfs id is consistent for node 1" '
ipfsi 0 id "$(iptb attr get 1 id)" > 0see1 &&
ipfsi 1 id > 1see1 &&
test_cmp 0see1 1see1
'
test_expect_success "addresses contain /p2p/..." '
test_should_contain "/p2p/$(iptb attr get 1 id)\"" 0see1 &&
test_should_contain "/p2p/$(iptb attr get 1 id)\"" 1see1 &&
test_should_contain "/p2p/$(iptb attr get 0 id)\"" 1see0 &&
test_should_contain "/p2p/$(iptb attr get 0 id)\"" 0see0
'
test_expect_success "stopping cluster" '
iptb stop
'