simplify NewBit signature

1 files changed, 31 insertions, 7 deletions

diff --git a/nizk/stage2_test.go b/nizk/stage2_test.go
index 2e5ac06..3a2d51c 100644
--- a/nizk/stage2_test.go
+++ b/nizk/stage2_test.go
@@ -10,7 +10,7 @@ func TestStage2Simple1(t *testing.T) {
 	id := Curve.RandomScalar()
 
 	for _, lost := range []bool{true, false} {
-		b1, _, _ := NewBit(id, !lost)
+		b1 := NewBit(id, !lost)
 		c1 := b1.StageCommit()
 		r1, _ := b1.RevealStage1()
 
@@ -23,28 +23,52 @@ func TestStage2Simple1(t *testing.T) {
 			{false, true},
 			{true, true},
 		} {
-			b2, bc2, _ := NewBit(id, s[0])
-			b3, bc3, _ := NewBit(id, s[1])
-			b4, bc4, _ := NewBit(id, s[1]) // same as b3
+			b2 := NewBit(id, s[0])
+			b3 := NewBit(id, s[1])
+			b4 := NewBit(id, s[1]) // same as b3
 
 			c2 := b2.StageCommit()
 			c3 := b3.StageCommit()
 			c4 := b4.StageCommit()
 
 			r2, p2 := b2.RevealStage2(lost, b1)
-			if !bc2.VerifyStage2(c1, c2, r1, r2, p2) {
+			if !b2.Commitment.VerifyStage2(c1, c2, r1, r2, p2) {
 				t.Fatalf("failed to verify b2: %t b3: %t bc2/b1", s[0], s[1])
 			}
 
 			r3, p3 := b3.RevealStage2(lost, b1)
-			if !bc3.VerifyStage2(c1, c3, r1, r3, p3) {
+			if !b3.Commitment.VerifyStage2(c1, c3, r1, r3, p3) {
 				t.Fatalf("failed to verify b1: %t b3: %t bc3/b1", s[0], s[1])
 			}
 
 			r4, p4 := b4.RevealStage2(lost, b1)
-			if !bc4.VerifyStage2(c1, c4, r1, r4, p4) {
+			if !b4.Commitment.VerifyStage2(c1, c4, r1, r4, p4) {
 				t.Fatalf("failed to verify b1: %t b4: %t bc4/b1", s[0], s[1])
 			}
 		}
 	}
 }
+
+func bit2bit(bid uint) [4]*Bit {
+	id := Curve.RandomScalar()
+
+	return [4]*Bit{
+		NewBit(id, (bid>>3)&1 != 0),
+		NewBit(id, (bid>>2)&1 != 0),
+		NewBit(id, (bid>>1)&1 != 0),
+		NewBit(id, (bid>>0)&1 != 0),
+	}
+}
+
+func TestStage2Complex(t *testing.T) {
+	bits1 := 0b0101
+	bits2 := 0b0010
+	t.Logf("testing bits1: %b vs. bits2: %b", bits1, bits2)
+}
+
+func TestFromPaper(t *testing.T) {
+	bid1 := 0b01010
+	bid2 := 0b01001
+	bid3 := 0b00111
+	t.Logf("testing\n\tbits1: %04b\n\tbits2: %04b\n\tbits3: %04b", bid1, bid2, bid3)
+}