Simplified conditions

diff --git a/src/sp.go b/src/sp.go
index 29fbf9b5f2945d70c725f888babbb4b023d2eb6f..115b39ef61a2ceeba749cc8c9acfa5c722066489 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -287,21 +287,22 @@ func (state *SPState) dirUnlock() {
 
 func (state *SPState) WriteSP(dst io.Writer, payload []byte, ping bool) error {
        state.writeSPBuf.Reset()
-       n, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
+       if _, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
                Magic:   MagicNNCPSv1.B,
                Payload: payload,
-       })
+       }); err != nil {
+               return err
+       }
+       n, err := dst.Write(state.writeSPBuf.Bytes())
        if err != nil {
                return err
        }
-       if n, err = dst.Write(state.writeSPBuf.Bytes()); err == nil {
-               state.TxLastSeen = time.Now()
-               state.TxBytes += int64(n)
-               if !ping {
-                       state.TxLastNonPing = state.TxLastSeen
-               }
+       state.TxLastSeen = time.Now()
+       state.TxBytes += int64(n)
+       if !ping {
+               state.TxLastNonPing = state.TxLastSeen
        }
-       return err
+       return nil
 }
 
 func (state *SPState) ReadSP(src io.Reader) ([]byte, error) {

diff --git a/src/toss_test.go b/src/toss_test.go
index b17fc7ba6ec8e2f4acc2f81965dc6051472fc4bd..966b2b84ae4a0914d42ad2681e64dbca6b4e4bc1 100644 (file)
--- a/src/toss_test.go
+++ b/src/toss_test.go
@@ -315,10 +315,7 @@ func TestTossFileSameName(t *testing.T) {
                        }
                        delete(expected, filename)
                }
-               if len(expected) != 0 {
-                       return false
-               }
-               return true
+               return len(expected) == 0
        }
        if err := quick.Check(f, nil); err != nil {
                t.Error(err)
@@ -518,10 +515,7 @@ func TestTossTrns(t *testing.T) {
                                }
                        }
                }
-               if len(datum) > 0 {
-                       return false
-               }
-               return true
+               return len(datum) == 0
        }
        if err := quick.Check(f, nil); err != nil {
                t.Error(err)