From 5951af1c23686a38e383bbe35be49d2f6e1258a2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bossuat <jean-philippe@tuneinsight.com>
Date: Mon, 24 Apr 2023 21:05:56 +0200
Subject: [PATCH] staticcheck

---
 drlwe/keygen_gal.go      | 2 +-
 drlwe/keyswitch_sk.go    | 2 +-
 drlwe/refresh.go         | 2 +-
 ring/poly.go             | 2 +-
 rlwe/evaluationkeyset.go | 2 +-
 rlwe/gadgetciphertext.go | 2 +-
 rlwe/galoiskey.go        | 2 +-
 rlwe/operand.go          | 4 ++--
 rlwe/power_basis.go      | 2 +-
 rlwe/ringqp/poly.go      | 2 +-
 rlwe/secretkey.go        | 2 +-
 utils/structs/map.go     | 2 +-
 utils/structs/matrix.go  | 2 +-
 utils/structs/vector.go  | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drlwe/keygen_gal.go b/drlwe/keygen_gal.go
index 2b1465f3..d386e015 100644
--- a/drlwe/keygen_gal.go
+++ b/drlwe/keygen_gal.go
@@ -250,7 +250,7 @@ func (share *GKGShare) BinarySize() int {
 func (share *GKGShare) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = share.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // Encode encodes the object into a binary form on a preallocated slice of bytes
diff --git a/drlwe/keyswitch_sk.go b/drlwe/keyswitch_sk.go
index bc19be50..63428331 100644
--- a/drlwe/keyswitch_sk.go
+++ b/drlwe/keyswitch_sk.go
@@ -169,7 +169,7 @@ func (ckss *CKSShare) BinarySize() int {
 func (ckss *CKSShare) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = ckss.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // Encode encodes the object into a binary form on a preallocated slice of bytes
diff --git a/drlwe/refresh.go b/drlwe/refresh.go
index 78640861..d31c9ca0 100644
--- a/drlwe/refresh.go
+++ b/drlwe/refresh.go
@@ -24,7 +24,7 @@ func (share *RefreshShare) BinarySize() int {
 func (share *RefreshShare) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = share.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // Encode encodes the object into a binary form on a preallocated slice of bytes
diff --git a/ring/poly.go b/ring/poly.go
index a1c55bb0..1bb5fc90 100644
--- a/ring/poly.go
+++ b/ring/poly.go
@@ -133,7 +133,7 @@ func (pol *Poly) BinarySize() (size int) {
 func (pol *Poly) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = pol.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/rlwe/evaluationkeyset.go b/rlwe/evaluationkeyset.go
index e924c5d7..e609aadb 100644
--- a/rlwe/evaluationkeyset.go
+++ b/rlwe/evaluationkeyset.go
@@ -84,7 +84,7 @@ func (evk *EvaluationKeySet) GetRelinearizationKey() (rk *RelinearizationKey, er
 func (evk *EvaluationKeySet) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = evk.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/rlwe/gadgetciphertext.go b/rlwe/gadgetciphertext.go
index e02bdb53..1c242776 100644
--- a/rlwe/gadgetciphertext.go
+++ b/rlwe/gadgetciphertext.go
@@ -70,7 +70,7 @@ func (ct *GadgetCiphertext) CopyNew() (ctCopy *GadgetCiphertext) {
 func (ct *GadgetCiphertext) MarshalBinary() (data []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = ct.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/rlwe/galoiskey.go b/rlwe/galoiskey.go
index 009c9497..1c06a7ce 100644
--- a/rlwe/galoiskey.go
+++ b/rlwe/galoiskey.go
@@ -51,7 +51,7 @@ func (gk *GaloisKey) CopyNew() *GaloisKey {
 func (gk *GaloisKey) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = gk.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // WriteTo writes the object on an io.Writer.
diff --git a/rlwe/operand.go b/rlwe/operand.go
index 1a31b122..ff371656 100644
--- a/rlwe/operand.go
+++ b/rlwe/operand.go
@@ -229,7 +229,7 @@ func SwitchCiphertextRingDegree(ctIn, ctOut *OperandQ) {
 func (op *OperandQ) MarshalBinary() (data []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = op.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by MarshalBinary
@@ -377,7 +377,7 @@ func (op *OperandQP) CopyNew() *OperandQP {
 func (op *OperandQP) MarshalBinary() (data []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = op.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by MarshalBinary
diff --git a/rlwe/power_basis.go b/rlwe/power_basis.go
index 18efd254..88c24ac8 100644
--- a/rlwe/power_basis.go
+++ b/rlwe/power_basis.go
@@ -32,7 +32,7 @@ func NewPowerBasis(ct *Ciphertext, basis polynomial.Basis) (p *PowerBasis) {
 func (p *PowerBasis) MarshalBinary() (data []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = p.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/rlwe/ringqp/poly.go b/rlwe/ringqp/poly.go
index dc3abf5a..4375b15a 100644
--- a/rlwe/ringqp/poly.go
+++ b/rlwe/ringqp/poly.go
@@ -335,7 +335,7 @@ func (p *Poly) Decode(data []byte) (n int, err error) {
 func (p *Poly) MarshalBinary() (data []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = p.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/rlwe/secretkey.go b/rlwe/secretkey.go
index 09d1161e..22a9798a 100644
--- a/rlwe/secretkey.go
+++ b/rlwe/secretkey.go
@@ -50,7 +50,7 @@ func (sk *SecretKey) CopyNew() *SecretKey {
 func (sk *SecretKey) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = sk.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // WriteTo writes the object on an io.Writer.
diff --git a/utils/structs/map.go b/utils/structs/map.go
index 84e876a8..376e7523 100644
--- a/utils/structs/map.go
+++ b/utils/structs/map.go
@@ -36,7 +36,7 @@ func (m Map[V, T]) CopyNew() *Map[V, T] {
 func (m *Map[V, T]) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = m.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/utils/structs/matrix.go b/utils/structs/matrix.go
index ba88c010..192209fc 100644
--- a/utils/structs/matrix.go
+++ b/utils/structs/matrix.go
@@ -38,7 +38,7 @@ func (m Matrix[T]) CopyNew() *Matrix[T] {
 func (m *Matrix[T]) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = m.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by
diff --git a/utils/structs/vector.go b/utils/structs/vector.go
index aad8fab3..c09579a0 100644
--- a/utils/structs/vector.go
+++ b/utils/structs/vector.go
@@ -34,7 +34,7 @@ func (v Vector[T]) CopyNew() *Vector[T] {
 func (v *Vector[T]) MarshalBinary() (p []byte, err error) {
 	buf := bytes.NewBuffer([]byte{})
 	_, err = v.WriteTo(buf)
-	return buf.Bytes(), nil
+	return buf.Bytes(), err
 }
 
 // UnmarshalBinary decodes a slice of bytes generated by