diff --git a/cluster.go b/cluster.go index aa1c26b55..c770eab98 100644 --- a/cluster.go +++ b/cluster.go @@ -1299,10 +1299,8 @@ func (c *Cluster) FollowResizeInstruction(instr *internal.ResizeInstruction) err // Write to local frame and always close reader. if err := func() error { defer rd.Close() - if _, err := frag.ReadFrom(rd); err != nil { - return err - } - return nil + _, err := frag.ReadFrom(rd) + return err }(); err != nil { return errors.Wrap(err, "copying remote slice") } diff --git a/utils_test.go b/utils_test.go index 05afeac19..f4212e0ec 100644 --- a/utils_test.go +++ b/utils_test.go @@ -417,9 +417,5 @@ func (t *ClusterCluster) FollowResizeInstruction(instr *internal.ResizeInstructi } node := DecodeNode(instr.Coordinator) - if err := t.SendTo(node, complete); err != nil { - return err - } - - return nil + return t.SendTo(node, complete) } diff --git a/view_test.go b/view_test.go index 87ed8e628..7c7f53a26 100644 --- a/view_test.go +++ b/view_test.go @@ -69,10 +69,7 @@ func (v *View) Reopen() error { v.View = pilosa.NewView(path, v.Index(), v.Frame(), v.Name(), pilosa.DefaultCacheSize) v.View.RowAttrStore = v.RowAttrStore - if err := v.Open(); err != nil { - return err - } - return nil + return v.Open() } // MustSetBits sets bits on a row. Panic on error.