Skip to content

Commit

Permalink
Errors fix
Browse files Browse the repository at this point in the history
  • Loading branch information
K1li4nL committed Jun 12, 2024
1 parent e565d8b commit 2dff70d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions shuffle/sequence_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}

Expand Down
10 changes: 5 additions & 5 deletions shuffle/sequences.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]))
}
}

Expand Down
4 changes: 2 additions & 2 deletions sign/eddsa/eddsa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2dff70d

Please sign in to comment.