Reduce some if err != nil logic lines

2 files changed, 3 insertions, 6 deletions

diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
index 879765d..815a990 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4/framing/framing.go
@@ -187,8 +187,7 @@ func (encoder *Encoder) Encode(frame, payload []byte) (n int, err error) {
 
 	// Generate a new nonce.
 	var nonce [nonceLength]byte
-	err = encoder.nonce.bytes(&nonce)
-	if err != nil {
+	if err = encoder.nonce.bytes(&nonce); err != nil {
 		return 0, err
 	}
 	encoder.nonce.counter++
@@ -256,8 +255,7 @@ func (decoder *Decoder) Decode(data []byte, frames *bytes.Buffer) (int, error) {
 		}
 
 		// Derive the nonce the peer used.
-		err = decoder.nonce.bytes(&decoder.nextNonce)
-		if err != nil {
+		if err = decoder.nonce.bytes(&decoder.nextNonce); err != nil {
 			return 0, err
 		}
 
diff --git a/transports/scramblesuit/handshake_uniformdh.go b/transports/scramblesuit/handshake_uniformdh.go
index 4345d65..4b77e5a 100644
--- a/transports/scramblesuit/handshake_uniformdh.go
+++ b/transports/scramblesuit/handshake_uniformdh.go
@@ -109,8 +109,7 @@ func (hs *ssDHClientHandshake) parseServerHandshake(resp []byte) (int, []byte, e
 
 		// Pull out the public key, and derive the server mark.
 		hs.serverPublicKey = &uniformdh.PublicKey{}
-		err := hs.serverPublicKey.SetBytes(y)
-		if err != nil {
+		if err := hs.serverPublicKey.SetBytes(y); err != nil {
 			return 0, nil, err
 		}
 		hs.mac.Reset()