address CR feedback
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Jan 16, 2016 at 16:51 UTC
39d0b33507e5290a019c8bdbd91331b34bfcae67
3 files changed
+39
-4
core/bootstrap.go
+2
-2
@@ -201,7 +201,7 @@ func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.PeerInfo)
201
return nil
202
}
203
204
-func toPeerInfos(bpeers []config.BootstrapPeer) ([]peer.PeerInfo, error) {
204
+func toPeerInfos(bpeers []config.BootstrapPeer) []peer.PeerInfo {
205
pinfos := make(map[peer.ID]*peer.PeerInfo)
206
for _, bootstrap := range bpeers {
207
pinfo, ok := pinfos[bootstrap.ID()]
@@ -219,7 +219,7 @@ func toPeerInfos(bpeers []config.BootstrapPeer) ([]peer.PeerInfo, error) {
219
peers = append(peers, *pinfo)
220
}
221
222
- return peers, nil
222
+ return peers
223
}
224
225
func randomSubsetOfPeers(in []peer.PeerInfo, max int) []peer.PeerInfo {
core/core.go
+1
-1
@@ -468,7 +468,7 @@ func (n *IpfsNode) loadBootstrapPeers() ([]peer.PeerInfo, error) {
468
if err != nil {
469
return nil, err
470
}
471
- return toPeerInfos(parsed)
471
+ return toPeerInfos(parsed), nil
472
}
473
474
func (n *IpfsNode) loadFilesRoot() error {
test/sharness/t0121-bootstrap-iptb.sh
+36
-1
@@ -34,6 +34,41 @@ test_expect_success "setup iptb nodes" '
34
iptb init -n 5 -f --bootstrap=none --port=0
35
'
36
37
+test_expect_success "start up iptb nodes" '
38
+ iptb start
39
+'
40
+
41
+test_expect_success "check peers works" '
42
+ ipfs swarm peers >peers_out
43
+'
44
+
45
+test_expect_success "correct number of peers" '
46
+ test -z "`cat peers_out`"
47
+'
48
+
49
+betterwait() {
50
+ while kill -0 $1; do true; done
51
+}
52
+
53
+test_expect_success "bring down iptb nodes" '
54
+ PID0=$(cat "$IPTB_ROOT/0/daemon.pid") &&
55
+ PID1=$(cat "$IPTB_ROOT/1/daemon.pid") &&
56
+ PID2=$(cat "$IPTB_ROOT/2/daemon.pid") &&
57
+ PID3=$(cat "$IPTB_ROOT/3/daemon.pid") &&
58
+ PID4=$(cat "$IPTB_ROOT/4/daemon.pid") &&
59
+ iptb stop && # TODO: add --wait flag to iptb stop
60
+ betterwait $PID0
61
+ betterwait $PID1
62
+ betterwait $PID2
63
+ betterwait $PID3
64
+ betterwait $PID4
65
+'
66
+
67
+test_expect_success "reset iptb nodes" '
68
+ # the api doesnt seem to get cleaned up in sharness tests for some reason
69
+ iptb init -n 5 -f --bootstrap=none --port=0
70
+'
71
+
72
test_expect_success "set bootstrap addrs" '
73
bsn_peer_id=$(ipfs id -f "<id>") &&
74
BADDR="/ip4/127.0.0.1/tcp/$PORT_SWARM/ipfs/$bsn_peer_id" &&
@@ -53,7 +88,7 @@ test_expect_success "check peers works" '
88
'
89
90
test_expect_success "correct number of peers" '
56
- test `cat peers_out | wc -l` == 5
91
+ test `cat peers_out | wc -l` = 5
92
'
93
94
test_kill_ipfs_daemon