wip: refactor stage commit into a single data structure; test for stage2 STILL FAIL

1 files changed, 16 insertions, 15 deletions

diff --git a/nizk/stage2_test.go b/nizk/stage2_test.go
index 4d507d7..54f718d 100644
--- a/nizk/stage2_test.go
+++ b/nizk/stage2_test.go
@@ -3,25 +3,26 @@ package nizk
 import (
 	"testing"
 
-	// . "kesim.org/seal/common"
+	. "kesim.org/seal/common"
 )
 
 func TestStage2Simple(t *testing.T) {
-/*
-	id := Curve.RandomScalar()
-	b1 := NewBit(id, true)
-	b2 := NewBit(id, true)
+	id1 := Curve.RandomScalar()
+	id2 := Curve.RandomScalar()
+	b1 := NewBit(id1, true)
+	b2 := NewBit(id2, true)
 
-	_, _ = b1.Commit()
-	s1, c1 := b1.CommitStage1()
-	curr, _ := b2.Commit()
-	_, c2, p2 := b2.CommitStage2(true, s1)
+	s1, c1 := b1.Stage()
+	r1, _, _ := s1.RevealStage1()
 
-	if !curr.VerifyStage2(c1, c2, r1, r2, p2) {
+	bc2, _ := b2.Commit()
+	s2, c2 := b2.Stage()
+	r2, p2, e := s2.RevealStage2(true, s1)
+	if e != nil {
+		t.Fatalf("e: %v", e)
+	}
+	if !bc2.VerifyStage2(c1, c2, r1, r2, p2) {
+		t.Fatalf("failed to verify!\nbc2: %#v\nc1: %#v\nc2: %#v\nr1: %#v\nr2: %#v\np2: %#v\n",
+			bc2, c1, c2, r1, r2, p2)
 	}
-	*/
-}
-
-func TestStage2FromScalar(t *testing.T) {
-
 }