simplify api even more, make it also more robust

1 files changed, 8 insertions, 12 deletions

diff --git a/nizk/stage1_test.go b/nizk/stage1_test.go
index 954f356..2dd719b 100644
--- a/nizk/stage1_test.go
+++ b/nizk/stage1_test.go
@@ -8,15 +8,13 @@ import (
 
 func TestStage1Simple(t *testing.T) {
 	id := Curve.RandomScalar()
-	b1 := NewBit(id, true)
-	b2 := NewBit(id, false)
-	bc1, _ := b1.Commit()
-	bc2, _ := b2.Commit()
+	b1, bc1, _ := NewBit(id, true)
+	b2, bc2, _ := NewBit(id, false)
 
 	c1 := b1.StageCommit()
 	c2 := b2.StageCommit()
-	r1, pr1, _ := b1.RevealStage1() // Note: no Xs.
-	r2, pr2, _ := b2.RevealStage1() // Note: no Xs.
+	r1, pr1 := b1.RevealStage1() // Note: no Xs.
+	r2, pr2 := b2.RevealStage1() // Note: no Xs.
 	if !bc1.VerifyStage1(c1, r1, pr1) {
 		t.Fatal("Could not verify st1 with c1 and pr1, plus=true case")
 	}
@@ -35,15 +33,13 @@ func TestStage1FromScalars(t *testing.T) {
 		*s = Curve.RandomScalar()
 	}
 
-	b1 := NewBitFromScalars(id, true, α, β)
-	b2 := NewBitFromScalars(id, false, α, β)
-	bc1, _ := b1.Commit()
-	bc2, _ := b2.Commit()
+	b1, bc1, _ := NewBitFromScalars(id, true, α, β)
+	b2, bc2, _ := NewBitFromScalars(id, false, α, β)
 
 	c1 := b1.StageFromScalars(r, x)
 	c2 := b2.StageFromScalars(x, r)
-	r1, pr1, _ := b1.RevealStage1() // Note: no Xs
-	r2, pr2, _ := b2.RevealStage1() // Note: no Xs
+	r1, pr1 := b1.RevealStage1() // Note: no Xs
+	r2, pr2 := b2.RevealStage1() // Note: no Xs
 	if !bc1.VerifyStage1(c1, r1, pr1) {
 		t.Fatal("Could not verify st1 with c1 and pr1, plus=true case")
 	}