diff --git a/shuffle/sequence_test.go b/shuffle/sequence_test.go index 5f9610819..63814e625 100644 --- a/shuffle/sequence_test.go +++ b/shuffle/sequence_test.go @@ -20,37 +20,37 @@ func TestAssertXY(t *testing.T) { { x: nil, y: nil, - errStr: "X is empty", + errStr: "array X is empty", }, { x: [][]kyber.Point{{}}, y: [][]kyber.Point{{}}, - errStr: "X is empty", + errStr: "array X is empty", }, { x: [][]kyber.Point{make([]kyber.Point, 1)}, y: [][]kyber.Point{{}}, - errStr: "Y is empty", + errStr: "array Y is empty", }, { x: [][]kyber.Point{make([]kyber.Point, 1)}, y: nil, - errStr: "Y is empty", + errStr: "array Y is empty", }, { x: [][]kyber.Point{make([]kyber.Point, 1), make([]kyber.Point, 2)}, y: [][]kyber.Point{make([]kyber.Point, 1)}, - errStr: "X and Y have a different size: 2 != 1", + errStr: "arrays X and Y have a different size: 2 != 1", }, { x: [][]kyber.Point{make([]kyber.Point, 1)}, y: [][]kyber.Point{make([]kyber.Point, 2)}, - errStr: "Y[0] has unexpected size: 1 != 2", + errStr: "array Y[0] has unexpected size: 1 != 2", }, { x: [][]kyber.Point{make([]kyber.Point, 1), make([]kyber.Point, 2)}, y: [][]kyber.Point{make([]kyber.Point, 1), make([]kyber.Point, 1)}, - errStr: "X[1] has unexpected size: 1 != 2", + errStr: "array X[1] has unexpected size: 1 != 2", }, } diff --git a/shuffle/sequences.go b/shuffle/sequences.go index e3f8dcc39..1c41c49c6 100644 --- a/shuffle/sequences.go +++ b/shuffle/sequences.go @@ -125,24 +125,24 @@ func SequencesShuffle( // assertXY checks that x, y have the same dimensions and at least one element func assertXY(X, Y [][]kyber.Point) error { if len(X) == 0 || len(X[0]) == 0 { - return errors.New("X is empty") + return errors.New("array X is empty") } if len(Y) == 0 || len(Y[0]) == 0 { - return errors.New("Y is empty") + return errors.New("array Y is empty") } if len(X) != len(Y) { - return fmt.Errorf("X and Y have a different size: %d != %d", len(X), len(Y)) + return fmt.Errorf("arrays X and Y have a different size: %d != %d", len(X), len(Y)) } expected := len(X[0]) for i := range X { if len(X[i]) != expected { - return fmt.Errorf("X[%d] has unexpected size: %d != %d", i, expected, len(X[i])) + return fmt.Errorf("array X[%d] has unexpected size: %d != %d", i, expected, len(X[i])) } if len(Y[i]) != expected { - return fmt.Errorf("Y[%d] has unexpected size: %d != %d", i, expected, len(Y[i])) + return fmt.Errorf("array Y[%d] has unexpected size: %d != %d", i, expected, len(Y[i])) } } diff --git a/sign/eddsa/eddsa_test.go b/sign/eddsa/eddsa_test.go index 319186015..1a52b4739 100644 --- a/sign/eddsa/eddsa_test.go +++ b/sign/eddsa/eddsa_test.go @@ -171,7 +171,7 @@ func TestEdDSAVerifyNonCanonicalR(t *testing.T) { sig[i] = nonCanonicalR[i] } err = Verify(ed.Public, msg, sig) - require.EqualError(t, err, "r is not canonical") + require.EqualError(t, err, "point R is not canonical") } // Test non-canonical keys @@ -215,7 +215,7 @@ func TestEdDSAVerifySmallOrderR(t *testing.T) { } err = Verify(ed.Public, msg, sig) - require.EqualError(t, err, "r has small order") + require.EqualError(t, err, "point R has small order") } // Test for small order public key