Uncomment bls_test and internal folder (#517)

* Moved scheme.go and threshold.go into internals and uncommented bls_test.go
* Removed nerr++ in favor of len(errors)
* Changed the path for test
* Sorting imports

pairing/bn254/bls_test.go

@@ -3,8 +3,8 @@ package bn254
 import (
 	"testing"
 
+	"go.dedis.ch/kyber/v3/internal/test"
 	"go.dedis.ch/kyber/v3/sign/bls"
-	"go.dedis.ch/kyber/v3/sign/test"
 )
 
 func TestBLSSchemeBN254G1(t *testing.T) {

pairing/bn256/bls_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"go.dedis.ch/kyber/v3/internal/test"
 	"go.dedis.ch/kyber/v3/sign/bls"
-	"go.dedis.ch/kyber/v3/sign/test"
 	"go.dedis.ch/kyber/v3/util/random"
 )
 

pairing/circl_bls12381/suite_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.dedis.ch/kyber/v3"
+	"go.dedis.ch/kyber/v3/internal/test"
 	this "go.dedis.ch/kyber/v3/pairing/circl_bls12381"
 	"go.dedis.ch/kyber/v3/sign/bls"
 	"go.dedis.ch/kyber/v3/sign/tbls"
-	"go.dedis.ch/kyber/v3/sign/test"
 	"go.dedis.ch/kyber/v3/util/random"
 )
 

sign/bls/bls_test.go

@@ -119,6 +119,7 @@ func TestBLSFailAggregatedKey(t *testing.T) {
 		t.Fatal("bls: verification succeeded unexpectedly")
 	}
 }
+
 func TestBLSBatchVerify(t *testing.T) {
 	msg1 := []byte("Hello Boneh-Lynn-Shacham")
 	msg2 := []byte("Hello Dedis & Boneh-Lynn-Shacham")
@@ -136,6 +137,7 @@ func TestBLSBatchVerify(t *testing.T) {
 	err = BatchVerify(suite, []kyber.Point{public1, public2}, [][]byte{msg1, msg2}, aggregatedSig)
 	require.Nil(t, err)
 }
+
 func TestBLSFailBatchVerify(t *testing.T) {
 	msg1 := []byte("Hello Boneh-Lynn-Shacham")
 	msg2 := []byte("Hello Dedis & Boneh-Lynn-Shacham")
@@ -168,7 +170,6 @@ func TestBLSFailBatchVerify(t *testing.T) {
 			t.Fatal("bls: verification succeeded unexpectedly")
 		}
 	})
-
 }
 
 func BenchmarkBLSKeyCreation(b *testing.B) {
@@ -187,7 +188,8 @@ func BenchmarkBLSSign(b *testing.B) {
 	msg := []byte("Hello many times Boneh-Lynn-Shacham")
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		scheme.Sign(private, msg)
+		_, err := scheme.Sign(private, msg)
+		require.Nil(b, err)
 	}
 }
 
@@ -204,7 +206,8 @@ func BenchmarkBLSAggregateSigs(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		scheme.AggregateSignatures(sig1, sig2)
+		_, err := scheme.AggregateSignatures(sig1, sig2)
+		require.Nil(b, err)
 	}
 }
 
@@ -222,14 +225,14 @@ func BenchmarkBLSVerifyAggregate(b *testing.B) {
 	key := scheme.AggregatePublicKeys(public1, public2)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		scheme.Verify(key, msg, sig)
+		err := scheme.Verify(key, msg, sig)
+		require.Nil(b, err)
 	}
 }
 
 func BenchmarkBLSVerifyBatchVerify(b *testing.B) {
 	suite := bn256.NewSuite()
 	scheme := NewSchemeOnG1(suite)
-
 	numSigs := 100
 	privates := make([]kyber.Scalar, numSigs)
 	publics := make([]kyber.Point, numSigs)
@@ -240,7 +243,8 @@ func BenchmarkBLSVerifyBatchVerify(b *testing.B) {
 		privates[i] = private
 		publics[i] = public
 		msg := make([]byte, 64, 64)
-		rand.Read(msg)
+		_, err := rand.Read(msg)
+		require.Nil(b, err)
 		msgs[i] = msg
 		sig, err := scheme.Sign(private, msg)
 		require.Nil(b, err)
@@ -250,7 +254,8 @@ func BenchmarkBLSVerifyBatchVerify(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		aggregateSig, _ := scheme.AggregateSignatures(sigs...)
-		BatchVerify(suite, publics, msgs, aggregateSig)
+		err := BatchVerify(suite, publics, msgs, aggregateSig)
+		require.Nil(b, err)
 	}
 }
 

sign/tbls/tbls_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"go.dedis.ch/kyber/v3/internal/test"
 	"go.dedis.ch/kyber/v3/pairing/bn256"
 	"go.dedis.ch/kyber/v3/share"
-	"go.dedis.ch/kyber/v3/sign/test"
 	"go.dedis.ch/kyber/v3/xof/blake2xb"
 )
 

sign/test/bls_test.go

@@ -3,12 +3,13 @@ package test
 import (
 	"testing"
 
+	"go.dedis.ch/kyber/v3/internal/test"
 	bls "go.dedis.ch/kyber/v3/pairing/circl_bls12381"
 	sign "go.dedis.ch/kyber/v3/sign/bls"
 )
 
 func TestBLS12381(t *testing.T) {
 	suite := bls.NewSuiteBLS12381()
 	scheme := sign.NewSchemeOnG1(suite)
-	SchemeTesting(t, scheme)
+	test.SchemeTesting(t, scheme)
 }

util/random/rand.go

@@ -65,21 +65,19 @@ func (r *randstream) XORKeyStream(dst, src []byte) {
 
 	// try to read readerBytes bytes from all readers and write them in a buffer
 	var b bytes.Buffer
-	var nerr int
 	var errors []string
 	buff := make([]byte, readerBytes)
 	for _, reader := range r.Readers {
 		n, err := io.ReadFull(reader, buff)
 		if err != nil {
-			nerr++
 			errors = append(errors, err.Error())
 		}
 		b.Write(buff[:n])
 	}
 
 	// we are ok with few sources being insecure (i.e., providing less than
 	// readerBytes bytes), but not all of them
-	if nerr == len(r.Readers) {
+	if len(errors) == len(r.Readers) {
 		panic(errors)
 	}