From 3547f7ae335d696d428d5bc7b04c816190a9e2b3 Mon Sep 17 00:00:00 2001 From: rht Date: Tue, 26 May 2015 23:18:04 +0700 Subject: [PATCH] Replace 'var * bytes.Buffer' with '\1 := new(bytes.Buffer)' --- commands/cli/parse.go | 2 +- commands/response_test.go | 2 +- core/commands/bootstrap.go | 19 ++++++++------- core/commands/commands.go | 4 ++-- core/commands/diag.go | 12 +++++----- core/commands/diag_test.go | 4 ++-- core/commands/ls.go | 6 ++--- core/commands/mount_darwin.go | 10 ++++---- core/commands/object.go | 12 +++++----- core/commands/refs.go | 4 ++-- core/commands/repo.go | 2 +- core/commands/swarm.go | 8 +++---- core/commands/tour.go | 28 +++++++++++------------ core/commands/tour_test.go | 4 ++-- core/commands/update.go | 8 +++---- exchange/bitswap/message/message_test.go | 12 +++++----- merkledag/traverse/traverse_test.go | 2 +- p2p/crypto/secio/protocol.go | 4 ++-- p2p/protocol/mux_test.go | 8 +++---- repo/config/config.go | 12 +++++----- test/integration/addcat_test.go | 8 +++---- test/integration/bench_cat_test.go | 4 ++-- test/integration/grandcentral_test.go | 4 ++-- test/integration/three_legged_cat_test.go | 4 ++-- test/supernode_client/main.go | 4 ++-- util/ctx/ctxio_test.go | 4 ++-- util/testutil/gen.go | 2 +- 27 files changed, 96 insertions(+), 97 deletions(-) diff --git a/commands/cli/parse.go b/commands/cli/parse.go index 0b99fd499..193f07741 100644 --- a/commands/cli/parse.go +++ b/commands/cli/parse.go @@ -321,7 +321,7 @@ func appendString(args, inputs []string) ([]string, []string) { } func appendStdinAsString(args []string, stdin *os.File) ([]string, *os.File, error) { - var buf bytes.Buffer + buf := new(bytes.Buffer) _, err := buf.ReadFrom(stdin) if err != nil { diff --git a/commands/response_test.go b/commands/response_test.go index e62aaeebb..1266f556f 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -32,7 +32,7 @@ func TestMarshalling(t *testing.T) { if err != nil { t.Error(err, "Should have passed") } - var buf bytes.Buffer + buf := new(bytes.Buffer) buf.ReadFrom(reader) output := buf.String() if removeWhitespace(output) != "{\"Foo\":\"beep\",\"Bar\":\"boop\",\"Baz\":1337}" { diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go index e66467029..919a86179 100644 --- a/core/commands/bootstrap.go +++ b/core/commands/bootstrap.go @@ -112,13 +112,12 @@ in the bootstrap list). return nil, u.ErrCast() } - var buf bytes.Buffer - err := bootstrapWritePeers(&buf, "added ", v.Peers) - if err != nil { + buf := new(bytes.Buffer) + if err := bootstrapWritePeers(buf, "added ", v.Peers); err != nil { return nil, err } - return &buf, nil + return buf, nil }, }, } @@ -178,9 +177,9 @@ var bootstrapRemoveCmd = &cmds.Command{ return nil, u.ErrCast() } - var buf bytes.Buffer - err := bootstrapWritePeers(&buf, "removed ", v.Peers) - return &buf, err + buf := new(bytes.Buffer) + err := bootstrapWritePeers(buf, "removed ", v.Peers) + return buf, err }, }, } @@ -220,9 +219,9 @@ func bootstrapMarshaler(res cmds.Response) (io.Reader, error) { return nil, u.ErrCast() } - var buf bytes.Buffer - err := bootstrapWritePeers(&buf, "", v.Peers) - return &buf, err + buf := new(bytes.Buffer) + err := bootstrapWritePeers(buf, "", v.Peers) + return buf, err } func bootstrapWritePeers(w io.Writer, prefix string, peers []string) error { diff --git a/core/commands/commands.go b/core/commands/commands.go index 1d65cdbad..450bd2825 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -36,11 +36,11 @@ func CommandsCmd(root *cmds.Command) *cmds.Command { Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { v := res.Output().(*Command) - var buf bytes.Buffer + buf := new(bytes.Buffer) for _, s := range cmdPathStrings(v) { buf.Write([]byte(s + "\n")) } - return &buf, nil + return buf, nil }, }, Type: Command{}, diff --git a/core/commands/diag.go b/core/commands/diag.go index 7e78e531f..987db1f1b 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -132,14 +132,14 @@ that consume the dot format to generate graphs of the network. case visD3: res.SetOutput(bytes.NewReader(diag.GetGraphJson(info))) case visDot: - var buf bytes.Buffer - w := diag.DotWriter{W: &buf} + buf := new(bytes.Buffer) + w := diag.DotWriter{W: buf} err := w.WriteGraph(info) if err != nil { res.SetError(err, cmds.ErrNormal) return } - res.SetOutput(io.Reader(&buf)) + res.SetOutput(io.Reader(buf)) default: output, err := stdDiagOutputMarshal(standardDiagOutput(info)) if err != nil { @@ -152,12 +152,12 @@ that consume the dot format to generate graphs of the network. } func stdDiagOutputMarshal(output *DiagnosticOutput) (io.Reader, error) { - var buf bytes.Buffer - err := printDiagnostics(&buf, output) + buf := new(bytes.Buffer) + err := printDiagnostics(buf, output) if err != nil { return nil, err } - return &buf, nil + return buf, nil } func standardDiagOutput(info []*diag.DiagInfo) *DiagnosticOutput { diff --git a/core/commands/diag_test.go b/core/commands/diag_test.go index ad3748bd7..476c6a2c7 100644 --- a/core/commands/diag_test.go +++ b/core/commands/diag_test.go @@ -21,8 +21,8 @@ func TestPrintDiagnostics(t *testing.T) { }, }, } - var buf bytes.Buffer - if err := printDiagnostics(&buf, &output); err != nil { + buf := new(bytes.Buffer) + if err := printDiagnostics(buf, &output); err != nil { t.Fatal(err) } t.Log(buf.String()) diff --git a/core/commands/ls.go b/core/commands/ls.go index 0d926a457..130524621 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -109,8 +109,8 @@ it contains, with the following format: headers, _, _ := res.Request().Option("headers").Bool() output := res.Output().(*LsOutput) - var buf bytes.Buffer - w := tabwriter.NewWriter(&buf, 1, 2, 1, ' ', 0) + buf := new(bytes.Buffer) + w := tabwriter.NewWriter(buf, 1, 2, 1, ' ', 0) for _, object := range output.Objects { if len(output.Objects) > 1 { fmt.Fprintf(w, "%s:\n", object.Hash) @@ -130,7 +130,7 @@ it contains, with the following format: } w.Flush() - return &buf, nil + return buf, nil }, }, Type: LsOutput{}, diff --git a/core/commands/mount_darwin.go b/core/commands/mount_darwin.go index 09f33d5ce..db75a53f7 100644 --- a/core/commands/mount_darwin.go +++ b/core/commands/mount_darwin.go @@ -172,8 +172,8 @@ func tryGFVFromFuseVersion() (string, error) { } cmd := exec.Command("fuse-version", "-q", "-only", "agent", "-s", "OSXFUSE") - var out bytes.Buffer - cmd.Stdout = &out + out := new(bytes.Buffer) + cmd.Stdout = out if err := cmd.Run(); err != nil { return "", fmt.Errorf(errStrFailedToRunFuseVersion, fuseVersionPkg, dontCheckOSXFUSEConfigKey, err) } @@ -190,9 +190,9 @@ func ensureFuseVersionIsInstalled() error { // try installing it... log.Debug("fuse-version: no fuse-version. attempting to install.") cmd := exec.Command("go", "get", "github.com/jbenet/go-fuse-version/fuse-version") - var cmdout bytes.Buffer - cmd.Stdout = &cmdout - cmd.Stderr = &cmdout + cmdout := new(bytes.Buffer) + cmd.Stdout = cmdout + cmd.Stderr = cmdout if err := cmd.Run(); err != nil { // Ok, install fuse-version failed. is it they dont have fuse? cmdoutstr := cmdout.String() diff --git a/core/commands/object.go b/core/commands/object.go index 4175a6d5b..7ce9bd6b4 100644 --- a/core/commands/object.go +++ b/core/commands/object.go @@ -136,14 +136,14 @@ multihash. Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { object := res.Output().(*Object) - var buf bytes.Buffer - w := tabwriter.NewWriter(&buf, 1, 2, 1, ' ', 0) + buf := new(bytes.Buffer) + w := tabwriter.NewWriter(buf, 1, 2, 1, ' ', 0) fmt.Fprintln(w, "Hash\tSize\tName\t") for _, link := range object.Links { fmt.Fprintf(w, "%s\t%v\t%s\t\n", link.Hash, link.Size, link.Name) } w.Flush() - return &buf, nil + return buf, nil }, }, Type: Object{}, @@ -266,9 +266,9 @@ var objectStatCmd = &cmds.Command{ cmds.Text: func(res cmds.Response) (io.Reader, error) { ns := res.Output().(*dag.NodeStat) - var buf bytes.Buffer + buf := new(bytes.Buffer) w := func(s string, n int) { - fmt.Fprintf(&buf, "%s: %d\n", s, n) + fmt.Fprintf(buf, "%s: %d\n", s, n) } w("NumLinks", ns.NumLinks) w("BlockSize", ns.BlockSize) @@ -276,7 +276,7 @@ var objectStatCmd = &cmds.Command{ w("DataSize", ns.DataSize) w("CumulativeSize", ns.CumulativeSize) - return &buf, nil + return buf, nil }, }, } diff --git a/core/commands/refs.go b/core/commands/refs.go index 1f101843b..08ce59ec6 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -23,11 +23,11 @@ type KeyList struct { // KeyListTextMarshaler outputs a KeyList as plaintext, one key per line func KeyListTextMarshaler(res cmds.Response) (io.Reader, error) { output := res.Output().(*KeyList) - var buf bytes.Buffer + buf := new(bytes.Buffer) for _, key := range output.Keys { buf.WriteString(key.B58String() + "\n") } - return &buf, nil + return buf, nil } var RefsCmd = &cmds.Command{ diff --git a/core/commands/repo.go b/core/commands/repo.go index 298f0de66..8ae0d0408 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -78,7 +78,7 @@ order to reclaim hard disk space. return nil, u.ErrCast() } - var buf *bytes.Buffer + buf := new(bytes.Buffer) if quiet { buf = bytes.NewBufferString(string(obj.Key) + "\n") } else { diff --git a/core/commands/swarm.go b/core/commands/swarm.go index dfa49f35b..bd7b94324 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -130,7 +130,7 @@ ipfs swarm addrs lists all addresses this node is aware of. } sort.Sort(sort.StringSlice(ids)) - var buf bytes.Buffer + buf := new(bytes.Buffer) for _, p := range ids { paddrs := m.Addrs[p] buf.WriteString(fmt.Sprintf("%s (%d)\n", p, len(paddrs))) @@ -138,7 +138,7 @@ ipfs swarm addrs lists all addresses this node is aware of. buf.WriteString("\t" + addr + "\n") } } - return &buf, nil + return buf, nil }, }, Type: addrMap{}, @@ -273,12 +273,12 @@ func stringListMarshaler(res cmds.Response) (io.Reader, error) { return nil, errors.New("failed to cast []string") } - var buf bytes.Buffer + buf := new(bytes.Buffer) for _, s := range list.Strings { buf.WriteString(s) buf.WriteString("\n") } - return &buf, nil + return buf, nil } // parseAddresses is a function that takes in a slice of string peer addresses diff --git a/core/commands/tour.go b/core/commands/tour.go index 338a66a3d..80075036b 100644 --- a/core/commands/tour.go +++ b/core/commands/tour.go @@ -48,7 +48,7 @@ func tourRunFunc(req cmds.Request, res cmds.Response) { id = tour.TopicID(req.Arguments()[0]) } - var w bytes.Buffer + w := new(bytes.Buffer) t, err := tourGet(id) if err != nil { @@ -58,17 +58,17 @@ func tourRunFunc(req cmds.Request, res cmds.Response) { // 1) a simple error message // 2) the full list of topics - fmt.Fprintln(&w, "ERROR") - fmt.Fprintln(&w, err) - fmt.Fprintln(&w, "") - fprintTourList(&w, tour.TopicID(cfg.Tour.Last)) - res.SetOutput(bytes.NewReader(w.Bytes())) + fmt.Fprintln(w, "ERROR") + fmt.Fprintln(w, err) + fmt.Fprintln(w, "") + fprintTourList(w, tour.TopicID(cfg.Tour.Last)) + res.SetOutput(w) return } - fprintTourShow(&w, t) - res.SetOutput(bytes.NewReader(w.Bytes())) + fprintTourShow(w, t) + res.SetOutput(w) } var cmdIpfsTourNext = &cmds.Command{ @@ -77,7 +77,7 @@ var cmdIpfsTourNext = &cmds.Command{ }, Run: func(req cmds.Request, res cmds.Response) { - var w bytes.Buffer + w := new(bytes.Buffer) path := req.Context().ConfigRoot cfg, err := req.Context().GetConfig() if err != nil { @@ -91,7 +91,7 @@ var cmdIpfsTourNext = &cmds.Command{ res.SetError(err, cmds.ErrNormal) return } - if err := fprintTourShow(&w, topic); err != nil { + if err := fprintTourShow(w, topic); err != nil { res.SetError(err, cmds.ErrNormal) return } @@ -106,7 +106,7 @@ var cmdIpfsTourNext = &cmds.Command{ } } - res.SetOutput(bytes.NewReader(w.Bytes())) + res.SetOutput(w) }, } @@ -144,9 +144,9 @@ var cmdIpfsTourList = &cmds.Command{ return } - var w bytes.Buffer - fprintTourList(&w, tour.TopicID(cfg.Tour.Last)) - res.SetOutput(bytes.NewReader(w.Bytes())) + w := new(bytes.Buffer) + fprintTourList(w, tour.TopicID(cfg.Tour.Last)) + res.SetOutput(w) }, } diff --git a/core/commands/tour_test.go b/core/commands/tour_test.go index 514bf5974..f4b11c499 100644 --- a/core/commands/tour_test.go +++ b/core/commands/tour_test.go @@ -18,8 +18,8 @@ This is where we test our beautiful command line interfaces `, }, } - var buf bytes.Buffer - err := fprintTourShow(&buf, topic) + buf := new(bytes.Buffer) + err := fprintTourShow(buf, topic) if err != nil { t.Fatal(err) } diff --git a/core/commands/update.go b/core/commands/update.go index 3cfd21c55..a86619897 100644 --- a/core/commands/update.go +++ b/core/commands/update.go @@ -54,14 +54,14 @@ var updateCmd = &cmds.Command{ Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { v := res.Output().(*UpdateOutput) - var buf bytes.Buffer + buf := new(bytes.Buffer) if v.NewVersion != v.OldVersion { buf.WriteString(fmt.Sprintf("Successfully updated to IPFS version '%s' (from '%s')\n", v.NewVersion, v.OldVersion)) } else { buf.WriteString(fmt.Sprintf("Already updated to latest version ('%s')\n", v.NewVersion)) } - return &buf, nil + return buf, nil }, }, } @@ -90,14 +90,14 @@ var UpdateCheckCmd = &cmds.Command{ Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { v := res.Output().(*UpdateOutput) - var buf bytes.Buffer + buf := new(bytes.Buffer) if v.NewVersion != v.OldVersion { buf.WriteString(fmt.Sprintf("A new version of IPFS is available ('%s', currently running '%s')\n", v.NewVersion, v.OldVersion)) } else { buf.WriteString(fmt.Sprintf("Already updated to latest version ('%s')\n", v.NewVersion)) } - return &buf, nil + return buf, nil }, }, } diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go index 7a6a28a04..15fb7a22e 100644 --- a/exchange/bitswap/message/message_test.go +++ b/exchange/bitswap/message/message_test.go @@ -100,12 +100,12 @@ func TestToNetFromNetPreservesWantList(t *testing.T) { original.AddEntry(u.Key("T"), 1) original.AddEntry(u.Key("F"), 1) - var buf bytes.Buffer - if err := original.ToNet(&buf); err != nil { + buf := new(bytes.Buffer) + if err := original.ToNet(buf); err != nil { t.Fatal(err) } - copied, err := FromNet(&buf) + copied, err := FromNet(buf) if err != nil { t.Fatal(err) } @@ -130,12 +130,12 @@ func TestToAndFromNetMessage(t *testing.T) { original.AddBlock(blocks.NewBlock([]byte("F"))) original.AddBlock(blocks.NewBlock([]byte("M"))) - var buf bytes.Buffer - if err := original.ToNet(&buf); err != nil { + buf := new(bytes.Buffer) + if err := original.ToNet(buf); err != nil { t.Fatal(err) } - m2, err := FromNet(&buf) + m2, err := FromNet(buf) if err != nil { t.Fatal(err) } diff --git a/merkledag/traverse/traverse_test.go b/merkledag/traverse/traverse_test.go index 12aa9fd21..ff57909a3 100644 --- a/merkledag/traverse/traverse_test.go +++ b/merkledag/traverse/traverse_test.go @@ -317,7 +317,7 @@ func TestBFSSkip(t *testing.T) { func testWalkOutputs(t *testing.T, root *mdag.Node, opts Options, expect []byte) { expect = bytes.TrimLeft(expect, "\n") - var buf bytes.Buffer + buf := new(bytes.Buffer) walk := func(current State) error { s := fmt.Sprintf("%d %s\n", current.Depth, current.Node.Data) t.Logf("walk: %s", s) diff --git a/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go index 73cb5fdf0..b51197202 100644 --- a/p2p/crypto/secio/protocol.go +++ b/p2p/crypto/secio/protocol.go @@ -218,7 +218,7 @@ func (s *secureSession) runHandshake() error { s.local.ephemeralPubKey, genSharedKey, err = ci.GenerateEKeyPair(s.local.curveT) // Gather corpus to sign. - var selectionOut bytes.Buffer + selectionOut := new(bytes.Buffer) selectionOut.Write(proposeOutBytes) selectionOut.Write(proposeInBytes) selectionOut.Write(s.local.ephemeralPubKey) @@ -249,7 +249,7 @@ func (s *secureSession) runHandshake() error { // get their ephemeral pub key s.remote.ephemeralPubKey = exchangeIn.GetEpubkey() - var selectionIn bytes.Buffer + selectionIn := new(bytes.Buffer) selectionIn.Write(proposeInBytes) selectionIn.Write(proposeOutBytes) selectionIn.Write(s.remote.ephemeralPubKey) diff --git a/p2p/protocol/mux_test.go b/p2p/protocol/mux_test.go index 68cdb1175..9e3b24552 100644 --- a/p2p/protocol/mux_test.go +++ b/p2p/protocol/mux_test.go @@ -16,8 +16,8 @@ var testCases = map[string]string{ func TestWrite(t *testing.T) { for k, v := range testCases { - var buf bytes.Buffer - if err := WriteHeader(&buf, ID(k)); err != nil { + buf := new(bytes.Buffer) + if err := WriteHeader(buf, ID(k)); err != nil { t.Fatal(err) } @@ -46,13 +46,13 @@ func TestHandler(t *testing.T) { m.SetHandler("/ipfs/dksnafkasnfkdajfkdajfdsjadosiaaodj", h("bitswap")) for k, v := range testCases { - var buf bytes.Buffer + buf := new(bytes.Buffer) if _, err := buf.Write([]byte(v)); err != nil { t.Error(err) continue } - name, err := ReadHeader(&buf) + name, err := ReadHeader(buf) if err != nil { t.Error(err) continue diff --git a/repo/config/config.go b/repo/config/config.go index 1d2fa87ad..c9a8aabec 100644 --- a/repo/config/config.go +++ b/repo/config/config.go @@ -86,24 +86,24 @@ func Marshal(value interface{}) ([]byte, error) { } func FromMap(v map[string]interface{}) (*Config, error) { - var buf bytes.Buffer - if err := json.NewEncoder(&buf).Encode(v); err != nil { + buf := new(bytes.Buffer) + if err := json.NewEncoder(buf).Encode(v); err != nil { return nil, err } var conf Config - if err := json.NewDecoder(&buf).Decode(&conf); err != nil { + if err := json.NewDecoder(buf).Decode(&conf); err != nil { return nil, fmt.Errorf("Failure to decode config: %s", err) } return &conf, nil } func ToMap(conf *Config) (map[string]interface{}, error) { - var buf bytes.Buffer - if err := json.NewEncoder(&buf).Encode(conf); err != nil { + buf := new(bytes.Buffer) + if err := json.NewEncoder(buf).Encode(conf); err != nil { return nil, err } var m map[string]interface{} - if err := json.NewDecoder(&buf).Decode(&m); err != nil { + if err := json.NewDecoder(buf).Decode(&m); err != nil { return nil, fmt.Errorf("Failure to decode config: %s", err) } return m, nil diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go index df38fbbdf..62c8944fd 100644 --- a/test/integration/addcat_test.go +++ b/test/integration/addcat_test.go @@ -79,8 +79,8 @@ func AddCatPowers(conf testutil.LatencyConfig, megabytesMax int64) error { } func RandomBytes(n int64) []byte { - var data bytes.Buffer - random.WritePseudoRandomBytes(n, &data, kSeed) + data := new(bytes.Buffer) + random.WritePseudoRandomBytes(n, data, kSeed) return data.Bytes() } @@ -137,8 +137,8 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error { } // verify - var bufout bytes.Buffer - io.Copy(&bufout, readerCatted) + bufout := new(bytes.Buffer) + io.Copy(bufout, readerCatted) if 0 != bytes.Compare(bufout.Bytes(), data) { return errors.New("catted data does not match added data") } diff --git a/test/integration/bench_cat_test.go b/test/integration/bench_cat_test.go index 23931b3db..319ea75a1 100644 --- a/test/integration/bench_cat_test.go +++ b/test/integration/bench_cat_test.go @@ -86,8 +86,8 @@ func benchCat(b *testing.B, data []byte, conf testutil.LatencyConfig) error { } // verify - var bufout bytes.Buffer - io.Copy(&bufout, readerCatted) + bufout := new(bytes.Buffer) + io.Copy(bufout, readerCatted) if 0 != bytes.Compare(bufout.Bytes(), data) { return errors.New("catted data does not match added data") } diff --git a/test/integration/grandcentral_test.go b/test/integration/grandcentral_test.go index afc3a6688..e8419fe3b 100644 --- a/test/integration/grandcentral_test.go +++ b/test/integration/grandcentral_test.go @@ -68,8 +68,8 @@ func RunSupernodeBootstrappedAddCat(data []byte, conf testutil.LatencyConfig) er } // verify - var bufout bytes.Buffer - io.Copy(&bufout, readerCatted) + bufout := new(bytes.Buffer) + io.Copy(bufout, readerCatted) if 0 != bytes.Compare(bufout.Bytes(), data) { return errors.New("catted data does not match added data") } diff --git a/test/integration/three_legged_cat_test.go b/test/integration/three_legged_cat_test.go index 0a5b9c62f..26a7924b6 100644 --- a/test/integration/three_legged_cat_test.go +++ b/test/integration/three_legged_cat_test.go @@ -117,8 +117,8 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error { } // verify - var bufout bytes.Buffer - io.Copy(&bufout, readerCatted) + bufout := new(bytes.Buffer) + io.Copy(bufout, readerCatted) if 0 != bytes.Compare(bufout.Bytes(), data) { return errors.New("catted data does not match added data") } diff --git a/test/supernode_client/main.go b/test/supernode_client/main.go index 11ee6ed73..4e037e53b 100644 --- a/test/supernode_client/main.go +++ b/test/supernode_client/main.go @@ -180,8 +180,8 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error { defer dummy.Close() var i int64 = 1 for { - var buf bytes.Buffer - if err := random.WritePseudoRandomBytes(sizeOfIthFile(i), &buf, *seed); err != nil { + buf := new(bytes.Buffer) + if err := random.WritePseudoRandomBytes(sizeOfIthFile(i), buf, *seed); err != nil { log.Fatal(err) } // add to a dummy node to discover the key diff --git a/util/ctx/ctxio_test.go b/util/ctx/ctxio_test.go index 6682469aa..8b7bec214 100644 --- a/util/ctx/ctxio_test.go +++ b/util/ctx/ctxio_test.go @@ -49,8 +49,8 @@ func TestReader(t *testing.T) { } func TestWriter(t *testing.T) { - var buf bytes.Buffer - w := NewWriter(context.Background(), &buf) + buf := new(bytes.Buffer) + w := NewWriter(context.Background(), buf) // write three n, err := w.Write([]byte("abc")) diff --git a/util/testutil/gen.go b/util/testutil/gen.go index ae151c792..461a4c8c7 100644 --- a/util/testutil/gen.go +++ b/util/testutil/gen.go @@ -109,7 +109,7 @@ func (p *PeerNetParams) checkKeys() error { return errors.New("p.ID does not match p.PubKey") } - var buf bytes.Buffer + buf := new(bytes.Buffer) buf.Write([]byte("hello world. this is me, I swear.")) b := buf.Bytes()