Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Commit

Permalink
apply the megacheck tool to improve code quality
Browse files Browse the repository at this point in the history 
License: MIT
Signed-off-by: Zach Ramsay <zach.ramsay@gmail.com>
  • Loading branch information
@zramsay
zramsay committed May 31, 2017
1 parent 4f4ba29 commit ee18aaa
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 32 deletions.
10 changes: 5 additions & 5 deletions io/dagreader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io

import (
"bytes"
"io"
"io/ioutil"
"os"
"strings"
"testing"

Expand Down Expand Up @@ -54,7 +54,7 @@ func TestSeekAndRead(t *testing.T) {
}

for i := 255; i >= 0; i-- {
reader.Seek(int64(i), os.SEEK_SET)
reader.Seek(int64(i), io.SeekStart)

if reader.Offset() != int64(i) {
t.Fatal("expected offset to be increased by one after read")
Expand Down Expand Up @@ -100,14 +100,14 @@ func TestRelativeSeek(t *testing.T) {
t.Fatalf("expected to read: %d at %d, read %d", i, reader.Offset()-1, out)
}
if i != 255 {
_, err := reader.Seek(3, os.SEEK_CUR)
_, err := reader.Seek(3, io.SeekCurrent)
if err != nil {
t.Fatal(err)
}
}
}

_, err = reader.Seek(4, os.SEEK_END)
_, err = reader.Seek(4, io.SeekEnd)
if err != nil {
t.Fatal(err)
}
Expand All @@ -120,7 +120,7 @@ func TestRelativeSeek(t *testing.T) {
if int(out) != 255-i {
t.Fatalf("expected to read: %d at %d, read %d", 255-i, reader.Offset()-1, out)
}
reader.Seek(-5, os.SEEK_CUR) // seek 4 bytes but we read one byte every time so 5 bytes
reader.Seek(-5, io.SeekCurrent) // seek 4 bytes but we read one byte every time so 5 bytes
}

}
Expand Down
13 changes: 6 additions & 7 deletions io/pbdagreader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io"
"os"

mdag "github.com/ipfs/go-ipfs/merkledag"
ft "github.com/ipfs/go-ipfs/unixfs"
Expand Down Expand Up @@ -185,7 +184,7 @@ func (dr *pbDagReader) Offset() int64 {
// recreations that need to happen.
func (dr *pbDagReader) Seek(offset int64, whence int) (int64, error) {
switch whence {
case os.SEEK_SET:
case io.SeekStart:
if offset < 0 {
return -1, errors.New("Invalid offset")
}
Expand Down Expand Up @@ -226,7 +225,7 @@ func (dr *pbDagReader) Seek(offset int64, whence int) (int64, error) {
}

// set proper offset within child readseeker
n, err := dr.buf.Seek(left, os.SEEK_SET)
n, err := dr.buf.Seek(left, io.SeekStart)
if err != nil {
return -1, err
}
Expand All @@ -238,13 +237,13 @@ func (dr *pbDagReader) Seek(offset int64, whence int) (int64, error) {
}
dr.offset = offset
return offset, nil
case os.SEEK_CUR:
case io.SeekCurrent:
// TODO: be smarter here
noffset := dr.offset + offset
return dr.Seek(noffset, os.SEEK_SET)
case os.SEEK_END:
return dr.Seek(noffset, io.SeekStart)
case io.SeekEnd:
noffset := int64(dr.pbdata.GetFilesize()) - offset
return dr.Seek(noffset, os.SEEK_SET)
return dr.Seek(noffset, io.SeekStart)
default:
return 0, errors.New("invalid whence")
}
Expand Down
12 changes: 4 additions & 8 deletions mod/dagmodifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"context"
"errors"
"io"
"os"

chunk "github.com/ipfs/go-ipfs/importer/chunk"
help "github.com/ipfs/go-ipfs/importer/helpers"
Expand All @@ -14,7 +13,6 @@ import (
ft "github.com/ipfs/go-ipfs/unixfs"
uio "github.com/ipfs/go-ipfs/unixfs/io"

logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
cid "gx/ipfs/QmYhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid"
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
node "gx/ipfs/Qmb3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format"
Expand All @@ -26,8 +24,6 @@ var ErrUnrecognizedWhence = errors.New("unrecognized whence")
// 2MB
var writebufferSize = 1 << 21

var log = logging.Logger("dagio")

// DagModifier is the only struct licensed and able to correctly
// perform surgery on a DAG 'file'
// Dear god, please rename this to something more pleasant
Expand Down Expand Up @@ -340,7 +336,7 @@ func (dm *DagModifier) readPrep() error {
return err
}

i, err := dr.Seek(int64(dm.curWrOff), os.SEEK_SET)
i, err := dr.Seek(int64(dm.curWrOff), io.SeekStart)
if err != nil {
cancel()
return err
Expand Down Expand Up @@ -397,11 +393,11 @@ func (dm *DagModifier) Seek(offset int64, whence int) (int64, error) {

var newoffset uint64
switch whence {
case os.SEEK_CUR:
case io.SeekCurrent:
newoffset = dm.curWrOff + uint64(offset)
case os.SEEK_SET:
case io.SeekStart:
newoffset = uint64(offset)
case os.SEEK_END:
case io.SeekEnd:
newoffset = uint64(fisize) - uint64(offset)
default:
return 0, ErrUnrecognizedWhence
Expand Down
33 changes: 21 additions & 12 deletions mod/dagmodifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package mod

import (
"fmt"
"io"
"io/ioutil"
"os"
"testing"

"github.com/ipfs/go-ipfs/blocks/blockstore"
Expand Down Expand Up @@ -384,7 +384,7 @@ func TestDagTruncate(t *testing.T) {
t.Fatal("size was incorrect!")
}

_, err = dagmod.Seek(0, os.SEEK_SET)
_, err = dagmod.Seek(0, io.SeekStart)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -450,7 +450,7 @@ func TestSparseWrite(t *testing.T) {
t.Fatal("incorrect write amount")
}

_, err = dagmod.Seek(0, os.SEEK_SET)
_, err = dagmod.Seek(0, io.SeekStart)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -479,7 +479,7 @@ func TestSeekPastEndWrite(t *testing.T) {
buf := make([]byte, 5000)
u.NewTimeSeededRand().Read(buf[2500:])

nseek, err := dagmod.Seek(2500, os.SEEK_SET)
nseek, err := dagmod.Seek(2500, io.SeekStart)
if err != nil {
t.Fatal(err)
}
Expand All @@ -497,7 +497,7 @@ func TestSeekPastEndWrite(t *testing.T) {
t.Fatal("incorrect write amount")
}

_, err = dagmod.Seek(0, os.SEEK_SET)
_, err = dagmod.Seek(0, io.SeekStart)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -525,7 +525,7 @@ func TestRelativeSeek(t *testing.T) {

for i := 0; i < 64; i++ {
dagmod.Write([]byte{byte(i)})
if _, err := dagmod.Seek(1, os.SEEK_CUR); err != nil {
if _, err := dagmod.Seek(1, io.SeekCurrent); err != nil {
t.Fatal(err)
}
}
Expand Down Expand Up @@ -576,17 +576,26 @@ func TestEndSeek(t *testing.T) {
t.Fatal(err)
}

offset, err := dagmod.Seek(0, os.SEEK_CUR)
offset, err := dagmod.Seek(0, io.SeekCurrent)
if err != nil {
t.Fatal(err)
}
if offset != 100 {
t.Fatal("expected the relative seek 0 to return current location")
}

offset, err = dagmod.Seek(0, os.SEEK_SET)
offset, err = dagmod.Seek(0, io.SeekStart)
if err != nil {
t.Fatal(err)
}
if offset != 0 {
t.Fatal("expected the absolute seek to set offset at 0")
}

offset, err = dagmod.Seek(0, os.SEEK_END)
offset, err = dagmod.Seek(0, io.SeekEnd)
if err != nil {
t.Fatal(err)
}
if offset != 100 {
t.Fatal("expected the end seek to set offset at end")
}
Expand All @@ -612,7 +621,7 @@ func TestReadAndSeek(t *testing.T) {
}

readBuf := make([]byte, 4)
offset, err := dagmod.Seek(0, os.SEEK_SET)
offset, err := dagmod.Seek(0, io.SeekStart)
if offset != 0 {
t.Fatal("expected offset to be 0")
}
Expand All @@ -636,7 +645,7 @@ func TestReadAndSeek(t *testing.T) {
}

// skip 4
_, err = dagmod.Seek(1, os.SEEK_CUR)
_, err = dagmod.Seek(1, io.SeekCurrent)
if err != nil {
t.Fatalf("error: %s, offset %d, reader offset %d", err, dagmod.curWrOff, dagmod.read.Offset())
}
Expand Down Expand Up @@ -676,7 +685,7 @@ func TestCtxRead(t *testing.T) {
if err != nil {
t.Fatal(err)
}
dagmod.Seek(0, os.SEEK_SET)
dagmod.Seek(0, io.SeekStart)

readBuf := make([]byte, 4)
_, err = dagmod.CtxReadFull(ctx, readBuf)
Expand Down

0 comments on commit ee18aaa

Please sign in to comment.