Use ReadFull. Remove duplicated code
License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
Hector Sanjuan committed
Mar 1, 2018 at 14:17 UTC
cd9c8c5d45a949761bcbdd0c9c00df35bc120ddc
1 file changed
+16
-12
merkledag/merkledag_test.go
+16
-12
@@ -133,19 +133,23 @@ func TestBatchFetchDupBlock(t *testing.T) {
133
func makeTestDAG(t *testing.T, read io.Reader, ds ipld.DAGService) ipld.Node {
134
p := make([]byte, 512)
135
nodes := []*ProtoNode{}
136
- var err error
137
- n, err = io.ReadFull(read, p)
138
- if n != len(p) {
139
- t.Fatal("should have read 512 bytes from the reader")
140
- }
141
- for err == nil {
136
+
137
+ for {
138
+ n, err := io.ReadFull(read, p)
139
+ if err == io.EOF {
140
+ break
141
+ }
142
+
143
+ if err != nil {
144
+ t.Fatal(err)
145
+ }
146
+
147
+ if n != len(p) {
148
+ t.Fatal("should have read 512 bytes from the reader")
149
+ }
150
+
151
protoNode := NodeWithData(p)
152
nodes = append(nodes, protoNode)
144
- _, err = read.Read(p)
145
- }
146
-
147
- if err != io.EOF {
148
- t.Fatal(err)
153
}
154
155
ctx := context.Background()
@@ -158,7 +162,7 @@ func makeTestDAG(t *testing.T, read io.Reader, ds ipld.DAGService) ipld.Node {
162
t.Fatal(err)
163
}
164
}
161
- err = ds.Add(ctx, root)
165
+ err := ds.Add(ctx, root)
166
if err != nil {
167
t.Fatal(err)
168
}