Merge bitcoin-core/secp256k1#1705: musig/test: Remove dead code
8d967a602bmusig/test: Remove dead code (Tim Ruffing)983711cd6dmusig/tests: Refactor vectors_signverify (Tim Ruffing) Pull request description: ACKs for top commit: jonasnick: ACK8d967a602bTree-SHA512: 9cc3d84250a677a22badf8fb18d5c159816f2237f9dd8ac796e65a6e89921066aa718b4eb773e9c473ac61d5f18c392ae380d4e4b4e2c3424feff9475a1ce053
This commit is contained in:
@@ -910,12 +910,14 @@ static void musig_test_vectors_signverify(void) {
|
|||||||
* the signing key does not belong to any pubkey. */
|
* the signing key does not belong to any pubkey. */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
expected = c->error != MUSIG_PUBKEY;
|
expected = c->error != MUSIG_PUBKEY;
|
||||||
CHECK(expected == musig_vectors_keyagg_and_tweak(&error, &keyagg_cache, NULL, vector->pubkeys, NULL, c->key_indices_len, c->key_indices, 0, NULL, NULL));
|
CHECK(expected == musig_vectors_keyagg_and_tweak(&error, &keyagg_cache, NULL, vector->pubkeys, NULL, c->key_indices_len, c->key_indices, 0, NULL, NULL));
|
||||||
CHECK(expected || c->error == error);
|
CHECK(expected || c->error == error);
|
||||||
if (!expected) {
|
if (!expected) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
CHECK(secp256k1_ec_pubkey_parse(CTX, &pubkey, vector->pubkeys[0], sizeof(vector->pubkeys[0])));
|
||||||
|
|
||||||
expected = c->error != MUSIG_AGGNONCE;
|
expected = c->error != MUSIG_AGGNONCE;
|
||||||
CHECK(expected == secp256k1_musig_aggnonce_parse(CTX, &aggnonce, vector->aggnonces[c->aggnonce_index]));
|
CHECK(expected == secp256k1_musig_aggnonce_parse(CTX, &aggnonce, vector->aggnonces[c->aggnonce_index]));
|
||||||
@@ -924,14 +926,10 @@ static void musig_test_vectors_signverify(void) {
|
|||||||
}
|
}
|
||||||
CHECK(secp256k1_musig_nonce_process(CTX, &session, &aggnonce, vector->msgs[c->msg_index], &keyagg_cache));
|
CHECK(secp256k1_musig_nonce_process(CTX, &session, &aggnonce, vector->msgs[c->msg_index], &keyagg_cache));
|
||||||
|
|
||||||
CHECK(secp256k1_ec_pubkey_parse(CTX, &pubkey, vector->pubkeys[0], sizeof(vector->pubkeys[0])));
|
|
||||||
musig_test_set_secnonce(&secnonce, vector->secnonces[c->secnonce_index], &pubkey);
|
|
||||||
expected = c->error != MUSIG_SECNONCE;
|
expected = c->error != MUSIG_SECNONCE;
|
||||||
if (expected) {
|
CHECK(!expected);
|
||||||
CHECK(secp256k1_musig_partial_sign(CTX, &partial_sig, &secnonce, &keypair, &keyagg_cache, &session));
|
musig_test_set_secnonce(&secnonce, vector->secnonces[c->secnonce_index], &pubkey);
|
||||||
} else {
|
CHECK_ILLEGAL(CTX, secp256k1_musig_partial_sign(CTX, &partial_sig, &secnonce, &keypair, &keyagg_cache, &session));
|
||||||
CHECK_ILLEGAL(CTX, secp256k1_musig_partial_sign(CTX, &partial_sig, &secnonce, &keypair, &keyagg_cache, &session));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for (i = 0; i < sizeof(vector->verify_fail_case)/sizeof(vector->verify_fail_case[0]); i++) {
|
for (i = 0; i < sizeof(vector->verify_fail_case)/sizeof(vector->verify_fail_case[0]); i++) {
|
||||||
const struct musig_verify_fail_error_case *c = &vector->verify_fail_case[i];
|
const struct musig_verify_fail_error_case *c = &vector->verify_fail_case[i];
|
||||||
|
|||||||
Reference in New Issue
Block a user