From 4de9924f934dfd9b03ef3fbedbecb43a49ab3f82 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 12 Dec 2023 10:19:52 +0000 Subject: [PATCH] variable rename: `priv2pub` -> `pubkey_gen` --- extmod/secp256k1mod.c | 9 +++++++-- mmgen/proto/secp256k1/keygen.py | 12 ++++++------ test/unit_tests_d/ut_dep.py | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/extmod/secp256k1mod.c b/extmod/secp256k1mod.c index 4dab1512..31498015 100755 --- a/extmod/secp256k1mod.c +++ b/extmod/secp256k1mod.c @@ -20,7 +20,7 @@ #include #include -static PyObject * priv2pub(PyObject *self, PyObject *args) { +static PyObject * pubkey_gen(PyObject *self, PyObject *args) { const unsigned char * privkey; const int klen; const int compressed; @@ -65,7 +65,12 @@ struct module_state { #define GETSTATE(m) ((struct module_state*)PyModule_GetState(m)) static PyMethodDef secp256k1_methods[] = { - {"priv2pub", priv2pub, METH_VARARGS, "Generate pubkey from privkey using libsecp256k1"}, + { + "pubkey_gen", + pubkey_gen, + METH_VARARGS, + "Generate a serialized pubkey from privkey bytes" + }, {NULL, NULL} }; diff --git a/mmgen/proto/secp256k1/keygen.py b/mmgen/proto/secp256k1/keygen.py index 5e305661..d1f5d677 100755 --- a/mmgen/proto/secp256k1/keygen.py +++ b/mmgen/proto/secp256k1/keygen.py @@ -25,25 +25,25 @@ class backend: super().__init__(cfg) # catch ImportError to satisfy pylint when testing repo with unbuilt secp256k1 extension mod: try: - from .secp256k1 import priv2pub - self.priv2pub = priv2pub + from .secp256k1 import pubkey_gen + self.pubkey_gen = pubkey_gen except ImportError: from ...util import die die(3,'libsecp256k1.keygen.backend: you shouldn’t be seeing this') def to_pubkey(self,privkey): return PubKey( - s = self.priv2pub( privkey, int(privkey.compressed) ), + s = self.pubkey_gen( privkey, int(privkey.compressed) ), compressed = privkey.compressed ) @classmethod def get_clsname(cls,cfg,silent=False): try: - from .secp256k1 import priv2pub - if not priv2pub(bytes.fromhex('deadbeef'*8),1): + from .secp256k1 import pubkey_gen + if not pubkey_gen(bytes.fromhex('deadbeef'*8),1): from ...util import die die( 'ExtensionModuleError', - 'Unable to execute priv2pub() from secp256k1 extension module' ) + 'Unable to execute pubkey_gen() from secp256k1 extension module' ) return cls.__name__ except ImportError as e: if not silent: diff --git a/test/unit_tests_d/ut_dep.py b/test/unit_tests_d/ut_dep.py index 49662b1b..23962968 100755 --- a/test/unit_tests_d/ut_dep.py +++ b/test/unit_tests_d/ut_dep.py @@ -60,8 +60,8 @@ class unit_tests: return False def secp256k1(self,name,ut): - from mmgen.proto.secp256k1.secp256k1 import priv2pub - priv2pub(bytes.fromhex('deadbeef'*8),1) + from mmgen.proto.secp256k1.secp256k1 import pubkey_gen + pubkey_gen(bytes.fromhex('deadbeef'*8),1) return True def cryptography(self,name,ut):