- buf := bytes.NewBuffer(nil)
- _, err = v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err = v.BlockRead(context.Background(), TestHash, buf)
- if _, err := v.BlockRead(context.Background(), barHash, io.Discard); err == nil {
+ if err := v.BlockRead(context.Background(), barHash, brdiscard); err == nil {
v.BlockWrite(context.Background(), testHash, testDataA)
putErr := v.BlockWrite(context.Background(), testHash, testDataB)
v.BlockWrite(context.Background(), testHash, testDataA)
putErr := v.BlockWrite(context.Background(), testHash, testDataB)
- buf := bytes.NewBuffer(nil)
- _, getErr := v.BlockRead(context.Background(), testHash, buf)
+ buf := &brbuffer{}
+ getErr := v.BlockRead(context.Background(), testHash, buf)
t.Errorf("Got err putting block %q: %q, expected nil", TestBlock3, err)
}
t.Errorf("Got err putting block %q: %q, expected nil", TestBlock3, err)
}
- buf := bytes.NewBuffer(nil)
- _, err = v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err = v.BlockRead(context.Background(), TestHash, buf)
- _, err = v.BlockRead(context.Background(), TestHash2, buf)
+ err = v.BlockRead(context.Background(), TestHash2, buf)
- _, err = v.BlockRead(context.Background(), TestHash3, buf)
+ err = v.BlockRead(context.Background(), TestHash3, buf)
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash, buf)
- if _, err := v.BlockRead(context.Background(), TestHash, io.Discard); err == nil || !os.IsNotExist(err) {
+ if err := v.BlockRead(context.Background(), TestHash, brdiscard); err == nil || !os.IsNotExist(err) {
- _, err = v.BlockRead(context.Background(), TestHash, io.Discard)
+ err = v.BlockRead(context.Background(), TestHash, brdiscard)
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash, buf)
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash2, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash2, buf)
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash3, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash3, buf)
// Check that we actually wrote the blocks.
for _, blk := range blks {
// Check that we actually wrote the blocks.
for _, blk := range blks {
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), blk.hash, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), blk.hash, buf)
if err != nil {
t.Errorf("get %s: %v", blk.hash, err)
} else if buf.String() != string(blk.data) {
if err != nil {
t.Errorf("get %s: %v", blk.hash, err)
} else if buf.String() != string(blk.data) {
- buf := bytes.NewBuffer(nil)
- _, err = v.BlockRead(context.Background(), hash, buf)
+ buf := &brbuffer{}
+ err = v.BlockRead(context.Background(), hash, buf)
v.BlockWrite(context.Background(), TestHash, TestBlock)
v.TouchWithDate(TestHash, time.Now().Add(-2*s.cluster.Collections.BlobSigningTTL.Duration()))
v.BlockWrite(context.Background(), TestHash, TestBlock)
v.TouchWithDate(TestHash, time.Now().Add(-2*s.cluster.Collections.BlobSigningTTL.Duration()))
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash, buf)
- _, err = v.BlockRead(context.Background(), TestHash, buf)
+ err = v.BlockRead(context.Background(), TestHash, buf)
if err == nil || !os.IsNotExist(err) {
t.Errorf("os.IsNotExist(%v) should have been true", err)
}
if err == nil || !os.IsNotExist(err) {
t.Errorf("os.IsNotExist(%v) should have been true", err)
}
- _, err = v.BlockRead(context.Background(), TestHash, buf)
+ err = v.BlockRead(context.Background(), TestHash, buf)
- buf := bytes.NewBuffer(nil)
- _, err := v.BlockRead(context.Background(), TestHash, buf)
+ buf := &brbuffer{}
+ err := v.BlockRead(context.Background(), TestHash, buf)