From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 23 Mar 2023 10:04:10 +0000 (+0300)
Subject: Simplified conditions
X-Git-Tag: v8.8.3^2~9
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=269c2d8ced7a5f0e3d887cc9a4840f09101058b5

Simplified conditions
---

diff --git a/src/sp.go b/src/sp.go
index 29fbf9b..115b39e 100644
--- 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 b17fc7b..966b2b8 100644
--- 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)