keystore: simplify _schnorr_keypair

benma · benma · commit aa9b9328ae24 · 2024-09-24T14:23:51.000+02:00
diff --git a/src/keystore.c b/src/keystore.c
@@ -960,16 +960,13 @@ static bool _schnorr_keypair(
     if (!secp256k1_keypair_create(ctx, keypair_out, secret_key)) {
         return false;
     }
-    if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {
-        return false;
-    }
     if (tweak != NULL) {
         if (secp256k1_keypair_xonly_tweak_add(ctx, keypair_out, tweak) != 1) {
             return false;
         }
-        if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {
-            return false;
-        }
+    }
+    if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {
+        return false;
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -960,16 +960,13 @@ static bool _schnorr_keypair(`
`960`	`960`	`if (!secp256k1_keypair_create(ctx, keypair_out, secret_key)) {`
`961`	`961`	`return false;`
`962`	`962`	`}`
`963`		`- if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {`
`964`		`- return false;`
`965`		`- }`
`966`	`963`	`if (tweak != NULL) {`
`967`	`964`	`if (secp256k1_keypair_xonly_tweak_add(ctx, keypair_out, tweak) != 1) {`
`968`	`965`	`return false;`
`969`	`966`	`}`
`970`		`- if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {`
`971`		`- return false;`
`972`		`- }`
	`967`	`+ }`
	`968`	`+ if (!secp256k1_keypair_xonly_pub(ctx, pubkey_out, NULL, keypair_out)) {`
	`969`	`+ return false;`
`973`	`970`	`}`
`974`	`971`	`return true;`
`975`	`972`	`}`