use prefix in bootstrapWritePeers
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Mar 19, 2018 at 01:04 UTC
ed54f58df767a1580c55146d1a06a9dd4cdf8730
2 files changed
+43
-34
core/commands/bootstrap.go
+1
-1
@@ -364,7 +364,7 @@ func bootstrapWritePeers(w io.Writer, prefix string, peers []string) error {
364
365
sort.Stable(sort.StringSlice(peers))
366
for _, peer := range peers {
367
- _, err := w.Write([]byte(peer + "\n"))
367
+ _, err := w.Write([]byte(prefix + peer + "\n"))
368
if err != nil {
369
return err
370
}
test/sharness/t0120-bootstrap.sh
+42
-33
@@ -28,6 +28,7 @@ test_init_ipfs
28
# we use a function so that we can run it both offline + online
29
test_bootstrap_list_cmd() {
30
printf "" >list_expected
31
+
32
for BP in "$@"
33
do
34
echo "$BP" >>list_expected
@@ -64,9 +65,9 @@ test_bootstrap_cmd() {
65
'
66
67
test_expect_success "'ipfs bootstrap add' output looks good" '
67
- echo $BP1 >add_expected &&
68
- echo $BP2 >>add_expected &&
69
- echo $BP3 >>add_expected &&
68
+ echo "added $BP1" >add_expected &&
69
+ echo "added $BP2" >>add_expected &&
70
+ echo "added $BP3" >>add_expected &&
71
test_cmp add_expected add_actual
72
'
73
@@ -77,8 +78,8 @@ test_bootstrap_cmd() {
78
'
79
80
test_expect_success "'ipfs bootstrap rm' output looks good" '
80
- echo $BP1 >rm_expected &&
81
- echo $BP3 >>rm_expected &&
81
+ echo "removed $BP1" >rm_expected &&
82
+ echo "removed $BP3" >>rm_expected &&
83
test_cmp rm_expected rm_actual
84
'
85
@@ -89,19 +90,19 @@ test_bootstrap_cmd() {
90
'
91
92
test_expect_success "'ipfs bootstrap add --default' output has default BP" '
92
- echo $BP1 >add2_expected &&
93
- echo $BP2 >>add2_expected &&
94
- echo $BP3 >>add2_expected &&
95
- echo $BP4 >>add2_expected &&
96
- echo $BP5 >>add2_expected &&
97
- echo $BP6 >>add2_expected &&
98
- echo $BP7 >>add2_expected &&
99
- echo $BP8 >>add2_expected &&
100
- echo $BP9 >>add2_expected &&
101
- echo $BP10 >>add2_expected &&
102
- echo $BP11 >>add2_expected &&
103
- echo $BP12 >>add2_expected &&
104
- echo $BP13 >>add2_expected &&
93
+ echo "added $BP1" >add2_expected &&
94
+ echo "added $BP2" >>add2_expected &&
95
+ echo "added $BP3" >>add2_expected &&
96
+ echo "added $BP4" >>add2_expected &&
97
+ echo "added $BP5" >>add2_expected &&
98
+ echo "added $BP6" >>add2_expected &&
99
+ echo "added $BP7" >>add2_expected &&
100
+ echo "added $BP8" >>add2_expected &&
101
+ echo "added $BP9" >>add2_expected &&
102
+ echo "added $BP10" >>add2_expected &&
103
+ echo "added $BP11" >>add2_expected &&
104
+ echo "added $BP12" >>add2_expected &&
105
+ echo "added $BP13" >>add2_expected &&
106
test_cmp add2_expected add2_actual
107
'
108
@@ -112,19 +113,19 @@ test_bootstrap_cmd() {
113
'
114
115
test_expect_success "'ipfs bootstrap rm' output looks good" '
115
- echo $BP1 >rm2_expected &&
116
- echo $BP2 >>rm2_expected &&
117
- echo $BP3 >>rm2_expected &&
118
- echo $BP4 >>rm2_expected &&
119
- echo $BP5 >>rm2_expected &&
120
- echo $BP6 >>rm2_expected &&
121
- echo $BP7 >>rm2_expected &&
122
- echo $BP8 >>rm2_expected &&
123
- echo $BP9 >>rm2_expected &&
124
- echo $BP10 >>rm2_expected &&
125
- echo $BP11 >>rm2_expected &&
126
- echo $BP12 >>rm2_expected &&
127
- echo $BP13 >>rm2_expected &&
116
+ echo "removed $BP1" >rm2_expected &&
117
+ echo "removed $BP2" >>rm2_expected &&
118
+ echo "removed $BP3" >>rm2_expected &&
119
+ echo "removed $BP4" >>rm2_expected &&
120
+ echo "removed $BP5" >>rm2_expected &&
121
+ echo "removed $BP6" >>rm2_expected &&
122
+ echo "removed $BP7" >>rm2_expected &&
123
+ echo "removed $BP8" >>rm2_expected &&
124
+ echo "removed $BP9" >>rm2_expected &&
125
+ echo "removed $BP10" >>rm2_expected &&
126
+ echo "removed $BP11" >>rm2_expected &&
127
+ echo "removed $BP12" >>rm2_expected &&
128
+ echo "removed $BP13" >>rm2_expected &&
129
test_cmp rm2_expected rm2_actual
130
'
131
@@ -139,7 +140,11 @@ test_bootstrap_cmd() {
140
'
141
142
test_expect_success "output looks good" '
142
- test_cmp add_stdin_actual bpeers
143
+ echo "added $BP1" > bpeers_add_exp &&
144
+ echo "added $BP2" >> bpeers_add_exp &&
145
+ echo "added $BP3" >> bpeers_add_exp &&
146
+ echo "added $BP4" >> bpeers_add_exp &&
147
+ test_cmp add_stdin_actual bpeers_add_exp
148
'
149
150
test_bootstrap_list_cmd $BP1 $BP2 $BP3 $BP4
@@ -149,7 +154,11 @@ test_bootstrap_cmd() {
154
'
155
156
test_expect_success "output looks good" '
152
- test_cmp rm_stdin_actual bpeers
157
+ echo "removed $BP1" > bpeers_rm_exp &&
158
+ echo "removed $BP2" >> bpeers_rm_exp &&
159
+ echo "removed $BP3" >> bpeers_rm_exp &&
160
+ echo "removed $BP4" >> bpeers_rm_exp &&
161
+ test_cmp rm_stdin_actual bpeers_rm_exp
162
'
163
164
test_bootstrap_list_cmd