1 files changed, 18 insertions, 14 deletions
diff --git a/nizk/stage1_test.go b/nizk/stage1_test.go
index fd54b57..8fc8970 100644
--- a/nizk/stage1_test.go
+++ b/nizk/stage1_test.go
@@ -6,23 +6,25 @@ import (
 	. "kesim.org/seal/common"
 )
 
-func TestStage1(t *testing.T) {
+func TestStage1Simple(t *testing.T) {
 	id := Curve.RandomScalar()
 	b1 := NewBit(id, true)
 	b2 := NewBit(id, false)
 	bc1, _ := b1.Commit()
 	bc2, _ := b2.Commit()
 
-	_, c1, pr1 := b1.CommitStage1()
-	_, c2, pr2 := b2.CommitStage1()
-	if !bc1.VerifyStage1(c1, pr1) {
+	s1, c1 := b1.CommitStage1()
+	s2, c2 := b2.CommitStage1()
+	r1, pr1 := s1.RevealStage1() // Note: no Xs.
+	r2, pr2 := s2.RevealStage1() // Note: no Xs
+	if !bc1.VerifyStage1(c1, r1, pr1) {
 		t.Fatal("Could not verify st1 with c1 and pr1, plus=true case")
 	}
-	if !bc2.VerifyStage1(c2, pr2) {
+	if !bc2.VerifyStage1(c2, r2, pr2) {
 		t.Fatal("Could not verify st2 with c2 and pr2, plus=false case")
 	}
 	// Wrong proof test
-	if bc1.VerifyStage1(c1, pr2) {
+	if bc1.VerifyStage1(c1, r1, pr2) {
 		t.Fatal("Shouldn't be able to verify c1 with pr2")
 	}
 }
@@ -38,19 +40,21 @@ func TestStage1FromScalars(t *testing.T) {
 	bc1, _ := b1.Commit()
 	bc2, _ := b2.Commit()
 
-	_, c1, pr1 := b1.CommitStage1FromScalars(r, x)
-	_, c2, pr2 := b2.CommitStage1FromScalars(x, r)
-	if !bc1.VerifyStage1(c1, pr1) {
+	s1, c1 := b1.CommitStage1FromScalars(r, x)
+	s2, c2 := b2.CommitStage1FromScalars(x, r)
+	r1, pr1 := s1.RevealStage1() // Note: no Xs
+	r2, pr2 := s2.RevealStage1() // Note: no Xs
+	if !bc1.VerifyStage1(c1, r1, pr1) {
 		t.Fatal("Could not verify st1 with c1 and pr1, plus=true case")
 	}
-	if !bc2.VerifyStage1(c2, pr2) {
+	if !bc2.VerifyStage1(c2, r2, pr2) {
 		t.Fatal("Could not verify st2 with c2 and pr2, plus=false case")
 	}
 	// Wrong proof test
-	if bc1.VerifyStage1(c1, pr2) ||
-		bc1.VerifyStage1(c2, pr2) ||
-		bc2.VerifyStage1(c1, pr2) ||
-		bc2.VerifyStage1(c2, pr1) {
+	if bc1.VerifyStage1(c1, r1, pr2) ||
+		bc1.VerifyStage1(c2, r2, pr2) ||
+		bc2.VerifyStage1(c1, r1, pr2) ||
+		bc2.VerifyStage1(c2, r2, pr1) {
 		t.Fatal("Shouldn't be able to verify bc_i with c_j or pr_j")
 	}
 }