Skip to content

Commit ac5a0a1

Browse files
jonasnickjonasnick
committed
f rename keypair_pub_xonly to keypair_xonly_pub
1 parent fa34f6a commit ac5a0a1

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎include/secp256k1_extrakeys.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_keypair_pub(
191191
* argument of secp256k1_xonly_pubkey_from_pubkey (can be NULL).
192192
* In: keypair: pointer to a keypair (cannot be NULL)
193193
*/
194-
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_keypair_pub_xonly(
194+
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_keypair_xonly_pub(
195195
const secp256k1_context* ctx,
196196
secp256k1_xonly_pubkey *pubkey,
197197
int *pk_parity,
@@ -202,7 +202,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_keypair_pub_xonly(
202202
* and secret key parts of the keypair.
203203
*
204204
* Calling this function and then secp256k1_keypair_pub results in the same
205-
* public key as calling secp256k1_keypair_pub_xonly and then
205+
* public key as calling secp256k1_keypair_xonly_pub and then
206206
* secp256k1_xonly_pubkey_tweak_add.
207207
*
208208
* Returns: 0 if the arguments are invalid or the resulting keypair would be

‎src/bench_schnorrsig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int main(void) {
8181

8282
CHECK(secp256k1_keypair_create(data.ctx, keypair, sk));
8383
CHECK(secp256k1_schnorrsig_sign(data.ctx, sig, msg, keypair, NULL, NULL));
84-
CHECK(secp256k1_keypair_pub_xonly(data.ctx, &pk, NULL, keypair));
84+
CHECK(secp256k1_keypair_xonly_pub(data.ctx, &pk, NULL, keypair));
8585
CHECK(secp256k1_xonly_pubkey_serialize(data.ctx, pk_char, &pk) == 1);
8686
}
8787

‎src/modules/extrakeys/main_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ int secp256k1_keypair_pub(const secp256k1_context* ctx, secp256k1_pubkey *pubkey
175175
return 1;
176176
}
177177

178-
int secp256k1_keypair_pub_xonly(const secp256k1_context* ctx, secp256k1_xonly_pubkey *pubkey, int *pubkey_parity, const secp256k1_keypair *keypair) {
178+
int secp256k1_keypair_xonly_pub(const secp256k1_context* ctx, secp256k1_xonly_pubkey *pubkey, int *pubkey_parity, const secp256k1_keypair *keypair) {
179179
secp256k1_ge pk;
180180

181181
VERIFY_CHECK(ctx != NULL);

‎src/modules/extrakeys/tests_impl.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,30 +343,30 @@ void test_keypair(void) {
343343
CHECK(secp256k1_keypair_pub(none, &pk_tmp, &keypair) == 1);
344344
CHECK(memcmp(&pk, &pk_tmp, sizeof(pk)) == 0);
345345

346-
/** Test keypair_pub_xonly **/
346+
/** Test keypair_xonly_pub **/
347347
ecount = 0;
348348
secp256k1_rand256(sk);
349349
CHECK(secp256k1_keypair_create(ctx, &keypair, sk) == 1);
350-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk, &pk_parity, &keypair) == 1);
351-
CHECK(secp256k1_keypair_pub_xonly(none, NULL, &pk_parity, &keypair) == 0);
350+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk, &pk_parity, &keypair) == 1);
351+
CHECK(secp256k1_keypair_xonly_pub(none, NULL, &pk_parity, &keypair) == 0);
352352
CHECK(ecount == 1);
353-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk, NULL, &keypair) == 1);
354-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk, &pk_parity, NULL) == 0);
353+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk, NULL, &keypair) == 1);
354+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk, &pk_parity, NULL) == 0);
355355
CHECK(ecount == 2);
356356
CHECK(memcmp(zeros96, &xonly_pk, sizeof(xonly_pk)) == 0);
357357
/* Using an invalid keypair will set the xonly_pk to 0 (first reset
358358
* xonly_pk). */
359-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk, &pk_parity, &keypair) == 1);
359+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk, &pk_parity, &keypair) == 1);
360360
memset(&keypair, 0, sizeof(keypair));
361-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk, &pk_parity, &keypair) == 0);
361+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk, &pk_parity, &keypair) == 0);
362362
CHECK(memcmp(zeros96, &xonly_pk, sizeof(xonly_pk)) == 0);
363363
CHECK(ecount == 3);
364364

365365
/** keypair holds the same xonly pubkey as pubkey_create **/
366366
CHECK(secp256k1_ec_pubkey_create(sign, &pk, sk) == 1);
367367
CHECK(secp256k1_xonly_pubkey_from_pubkey(none, &xonly_pk, &pk_parity, &pk) == 1);
368368
CHECK(secp256k1_keypair_create(sign, &keypair, sk) == 1);
369-
CHECK(secp256k1_keypair_pub_xonly(none, &xonly_pk_tmp, &pk_parity_tmp, &keypair) == 1);
369+
CHECK(secp256k1_keypair_xonly_pub(none, &xonly_pk_tmp, &pk_parity_tmp, &keypair) == 1);
370370
CHECK(memcmp(&xonly_pk, &xonly_pk_tmp, sizeof(pk)) == 0);
371371
CHECK(pk_parity == pk_parity_tmp);
372372

@@ -461,9 +461,9 @@ void test_keypair_add(void) {
461461
int pk_parity;
462462

463463
secp256k1_rand256(tweak);
464-
CHECK(secp256k1_keypair_pub_xonly(ctx, &internal_pk, NULL, &keypair) == 1);
464+
CHECK(secp256k1_keypair_xonly_pub(ctx, &internal_pk, NULL, &keypair) == 1);
465465
CHECK(secp256k1_keypair_xonly_tweak_add(ctx, &keypair, tweak) == 1);
466-
CHECK(secp256k1_keypair_pub_xonly(ctx, &output_pk, &pk_parity, &keypair) == 1);
466+
CHECK(secp256k1_keypair_xonly_pub(ctx, &output_pk, &pk_parity, &keypair) == 1);
467467

468468
/* Check that it passes xonly_pubkey_tweak_add_test */
469469
CHECK(secp256k1_xonly_pubkey_serialize(ctx, pk32, &output_pk) == 1);

‎src/modules/schnorrsig/tests_impl.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ void test_schnorrsig_api(void) {
123123
CHECK(secp256k1_keypair_create(ctx, &keypairs[0], sk1) == 1);
124124
CHECK(secp256k1_keypair_create(ctx, &keypairs[1], sk2) == 1);
125125
CHECK(secp256k1_keypair_create(ctx, &keypairs[2], sk3) == 1);
126-
CHECK(secp256k1_keypair_pub_xonly(ctx, &pk[0], NULL, &keypairs[0]) == 1);
127-
CHECK(secp256k1_keypair_pub_xonly(ctx, &pk[1], NULL, &keypairs[1]) == 1);
128-
CHECK(secp256k1_keypair_pub_xonly(ctx, &pk[2], NULL, &keypairs[2]) == 1);
126+
CHECK(secp256k1_keypair_xonly_pub(ctx, &pk[0], NULL, &keypairs[0]) == 1);
127+
CHECK(secp256k1_keypair_xonly_pub(ctx, &pk[1], NULL, &keypairs[1]) == 1);
128+
CHECK(secp256k1_keypair_xonly_pub(ctx, &pk[2], NULL, &keypairs[2]) == 1);
129129
memset(&zero_pk, 0, sizeof(zero_pk));
130130

131131
/** main test body **/
@@ -189,7 +189,7 @@ void test_schnorrsig_bip_vectors_check_signing(const unsigned char *sk, const un
189189
CHECK(memcmp(sig, expected_sig, 64) == 0);
190190

191191
CHECK(secp256k1_xonly_pubkey_parse(ctx, &pk_expected, pk_serialized));
192-
CHECK(secp256k1_keypair_pub_xonly(ctx, &pk, NULL, &keypair));
192+
CHECK(secp256k1_keypair_xonly_pub(ctx, &pk, NULL, &keypair));
193193
CHECK(memcmp(&pk, &pk_expected, sizeof(pk)) == 0);
194194
CHECK(secp256k1_schnorrsig_verify(ctx, sig, msg, &pk));
195195
}
@@ -695,7 +695,7 @@ void test_schnorrsig_sign_verify(void) {
695695
secp256k1_xonly_pubkey pk;
696696

697697
CHECK(secp256k1_keypair_create(ctx, &keypair, sk));
698-
CHECK(secp256k1_keypair_pub_xonly(ctx, &pk, NULL, &keypair));
698+
CHECK(secp256k1_keypair_xonly_pub(ctx, &pk, NULL, &keypair));
699699

700700
for (i = 0; i < N_SIGS; i++) {
701701
secp256k1_rand256(msg[i]);
@@ -744,11 +744,11 @@ void test_schnorrsig_taproot(void) {
744744
/* Create output key */
745745
secp256k1_rand256(sk);
746746
CHECK(secp256k1_keypair_create(ctx, &keypair, sk) == 1);
747-
CHECK(secp256k1_keypair_pub_xonly(ctx, &internal_pk, NULL, &keypair) == 1);
747+
CHECK(secp256k1_keypair_xonly_pub(ctx, &internal_pk, NULL, &keypair) == 1);
748748
/* In actual taproot the tweak would be hash of internal_pk */
749749
CHECK(secp256k1_xonly_pubkey_serialize(ctx, tweak, &internal_pk) == 1);
750750
CHECK(secp256k1_keypair_xonly_tweak_add(ctx, &keypair, tweak) == 1);
751-
CHECK(secp256k1_keypair_pub_xonly(ctx, &output_pk, &pk_parity, &keypair) == 1);
751+
CHECK(secp256k1_keypair_xonly_pub(ctx, &output_pk, &pk_parity, &keypair) == 1);
752752
CHECK(secp256k1_xonly_pubkey_serialize(ctx, output_pk_bytes, &output_pk) == 1);
753753

754754
/* Key spend */

0 commit comments

Comments
 (0)