binfhe_bindings cleanup

Author: dsuponitskiy-duality

src/include/binfhe/binfhecontext_wrapper.h

@@ -51,16 +51,6 @@ LWEPlaintext binfhe_DecryptWrapper(BinFHEContext &self,
                                    ConstLWECiphertext ct,
                                    LWEPlaintextModulus p);
 
-uint32_t GetnWrapper(BinFHEContext &self);
-
-const uint64_t GetqWrapper(BinFHEContext &self) ;
-
-const uint64_t GetMaxPlaintextSpaceWrapper(BinFHEContext &self);
-
-const uint64_t GetBetaWrapper(BinFHEContext &self);
-
-const uint64_t GetLWECiphertextModulusWrapper(LWECiphertext &self);
-
 std::vector<uint64_t> GenerateLUTviaFunctionWrapper(BinFHEContext &self, py::function f, uint64_t p);
 
 NativeInteger StaticFunction(NativeInteger m, NativeInteger p);

src/lib/binfhe/binfhecontext_wrapper.cpp

@@ -54,31 +54,6 @@ LWEPlaintext binfhe_DecryptWrapper(BinFHEContext &self,
     return result;
 }
 
-uint32_t GetnWrapper(BinFHEContext &self)
-{
-    return self.GetParams()->GetLWEParams()->Getn();
-}
-
-const uint64_t GetqWrapper(BinFHEContext &self)
-{
-    return self.GetParams()->GetLWEParams()->Getq().ConvertToInt<uint64_t>();
-}
-
-const uint64_t GetMaxPlaintextSpaceWrapper(BinFHEContext &self)
-{
-    return self.GetMaxPlaintextSpace().ConvertToInt<uint64_t>();
-}
-
-const uint64_t GetBetaWrapper(BinFHEContext &self)
-{
-    return self.GetBeta().ConvertToInt<uint64_t>();
-}
-
-const uint64_t GetLWECiphertextModulusWrapper(LWECiphertext &self)
-{
-    return self->GetModulus().ConvertToInt<uint64_t>();
-}
-
 // Define static variables to hold the state
 py::function* static_f = nullptr;
 

src/lib/binfhe_bindings.cpp

@@ -147,7 +147,10 @@ void bind_binfhe_ciphertext(py::module &m) {
      py::class_<LWECiphertextImpl, std::shared_ptr<LWECiphertextImpl>>(m, "LWECiphertext")
           .def(py::init<>())
           .def("GetLength", &LWECiphertextImpl::GetLength)
-          .def("GetModulus", &GetLWECiphertextModulusWrapper)
+          .def("GetModulus",
+               [](LWECiphertext& self) {
+                    return self->GetModulus().ConvertToInt<uint64_t>();
+               })
           .def(py::self == py::self)
           .def(py::self != py::self);
 }
@@ -206,10 +209,22 @@ void bind_binfhe_context(py::module &m) {
           .def("EvalNOT", &BinFHEContext::EvalNOT,
                binfhe_EvalNOT_docs,
                py::arg("ct"))
-          .def("Getn", &GetnWrapper)
-          .def("Getq", &GetqWrapper)
-          .def("GetMaxPlaintextSpace", &GetMaxPlaintextSpaceWrapper)
-          .def("GetBeta", &GetBetaWrapper)
+          .def("Getn",
+               [](BinFHEContext& self) {
+                    return self.GetParams()->GetLWEParams()->Getn();
+               })
+          .def("Getq",
+               [](BinFHEContext& self) {
+                    return self.GetParams()->GetLWEParams()->Getq().ConvertToInt<uint64_t>();
+               })
+          .def("GetMaxPlaintextSpace",
+               [](BinFHEContext& self) {
+                    return self.GetMaxPlaintextSpace().ConvertToInt<uint64_t>();
+               })
+          .def("GetBeta",
+               [](BinFHEContext& self) {
+                    return self.GetBeta().ConvertToInt<uint64_t>();
+               })
           .def("EvalDecomp", &BinFHEContext::EvalDecomp,
                binfhe_EvalDecomp_docs,
                py::arg("ct"))
@@ -229,7 +244,6 @@ void bind_binfhe_context(py::module &m) {
                binfhe_EvalSign_docs,
                py::arg("ct"),
                py::arg("schemeSwitch") = false)
-          .def("EvalNOT", &BinFHEContext::EvalNOT)
           .def("EvalConstant", &BinFHEContext::EvalConstant)
           .def("ClearBTKeys", &BinFHEContext::ClearBTKeys)
           .def("Bootstrap", &BinFHEContext::Bootstrap, py::arg("ct"), py::arg("extended") = false)