Add more threshold test cases

Signed-off-by: Marcus Brandenburger <[email protected]>

Author: mbrandenburger

test/tbls/tbls_test.go

@@ -53,7 +53,7 @@ func TestThresholdBLS(t *testing.T) {
 		}
 	}()
 
-	shares, start := keygen(t, parties, n)
+	shares, start := keygen(t, parties, n, n-1)
 
 	elapsed := time.Since(start)
 	t.Log("DKG elapsed", elapsed)
@@ -115,6 +115,108 @@ func TestThresholdBLS(t *testing.T) {
 	}
 }
 
+func TestThresholdBLSVarThreshold(t *testing.T) {
+	var tests = []struct {
+		n, threshold, k int
+	}{
+		{3, 1, 2},
+		{3, 2, 3},
+		{5, 2, 3},
+		{7, 5, 6},
+		{15, 10, 11},
+		{31, 21, 22},
+	}
+
+	for _, tt := range tests {
+		testname := fmt.Sprintf("n=%d,t=%d,k=%d", tt.n, tt.threshold, tt.k)
+		t.Run(testname, func(t *testing.T) {
+			testThresholdBLSVarThreshold(t, tt.n, tt.threshold, tt.k)
+		})
+	}
+}
+
+func testThresholdBLSVarThreshold(t *testing.T, n, threshold, k int) {
+	var commParties []*comm.Party
+	var signers []*tlsgen.CertKeyPair
+	var loggers []*commLogger
+	var listeners []net.Listener
+	var stopFuncs []func()
+
+	members, certPool, loggers, signers, listeners, commParties, membershipFunc, parties, kgf := setup(t, n, loggers, signers, listeners, commParties)
+
+	for id := 1; id <= n; id++ {
+		stop, s := createParty(id, kgf, signers[id-1], n, certPool, listeners, loggers, commParties, membershipFunc)
+		parties = append(parties, s)
+		stopFuncs = append(stopFuncs, stop)
+	}
+
+	defer func() {
+		for _, stop := range stopFuncs {
+			stop()
+		}
+	}()
+
+	shares, start := keygen(t, parties, n, threshold)
+
+	elapsed := time.Since(start)
+	t.Log("DKG elapsed", elapsed)
+
+	// Create the threshold signers.
+	thresholdSigners := make([]*bls.TBLS, n)
+	for id := 1; id <= n; id++ {
+		thresholdSigners[id-1] = &bls.TBLS{
+			Logger: logger(id, t.Name()),
+			Party:  uint16(id),
+		}
+	}
+
+	// Initialize them with a nil send function
+	for i, signer := range thresholdSigners {
+		signer.Init(members, threshold, nil)
+		signer.SetShareData(shares[i])
+	}
+
+	var signatures [][]byte
+
+	// Sign a message
+	msg := []byte("Three can keep a secret, if two of them are dead.")
+	digest := sha256Digest(msg)
+	for _, signer := range thresholdSigners {
+		sig, err := signer.Sign(nil, digest)
+		assert.NoError(t, err)
+		signatures = append(signatures, sig)
+	}
+
+	// check that all signers return the same pk?!
+	var pk []byte
+	for _, signer := range thresholdSigners {
+		pki, err := signer.ThresholdPK()
+		assert.NoError(t, err)
+		if pk == nil {
+			pk = pki
+		} else {
+			assert.Equal(t, pk, pki)
+		}
+	}
+
+	// create a verifier
+	var v bls.Verifier
+	err := v.Init(pk)
+	assert.NoError(t, err)
+
+	// aggregate k signatures using
+	var sig []byte
+	for i := 0; i < k; i++ {
+		for j := i + 1; j < k; j++ {
+			sig, err = v.AggregateSignatures([][]byte{signatures[i], signatures[j]}, []uint16{uint16(i + 1), uint16(j + 1)})
+			assert.NoError(t, err)
+		}
+	}
+
+	err = v.Verify(digest, sig)
+	assert.NoError(t, err)
+}
+
 func TestBenchmark(t *testing.T) {
 	var commParties []*comm.Party
 	var signers []*tlsgen.CertKeyPair
@@ -138,7 +240,7 @@ func TestBenchmark(t *testing.T) {
 		}
 	}()
 
-	shares, start := keygen(t, parties, n)
+	shares, start := keygen(t, parties, n, n-1)
 
 	elapsed := time.Since(start)
 	t.Log("DKG elapsed", elapsed)
@@ -264,7 +366,7 @@ func BenchmarkParallelInvocation(b *testing.B) {
 		}
 	}()
 
-	shares, start := keygen(b, parties, n)
+	shares, start := keygen(b, parties, n, n-1)
 
 	elapsed := time.Since(start)
 	b.Log("DKG elapsed", elapsed)
@@ -351,7 +453,7 @@ func BenchmarkParallelInvocation(b *testing.B) {
 var gsig []byte
 var gerr error
 
-func keygen(t TestingT, parties []MpcParty, n int) ([][]byte, time.Time) {
+func keygen(t TestingT, parties []MpcParty, n int, threshold int) ([][]byte, time.Time) {
 	var wg sync.WaitGroup
 	wg.Add(len(parties))
 
@@ -362,7 +464,7 @@ func keygen(t TestingT, parties []MpcParty, n int) ([][]byte, time.Time) {
 	for i, p := range parties {
 		go func(i int, p MpcParty) {
 			defer wg.Done()
-			secretShareData, err := p.KeyGen(ctx, len(parties), n-1)
+			secretShareData, err := p.KeyGen(ctx, len(parties), threshold)
 			shares[i] = secretShareData
 			assert.NoError(t, err)
 			assert.NotNil(t, secretShareData)