Skip to content

Commit

Permalink
lighter-weight buffer handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@arvidn @mariano54
arvidn authored and mariano54 committed May 9, 2022
1 parent 09db47d commit 51d8973
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 52 deletions.
58 changes: 29 additions & 29 deletions python-bindings/pythonbindings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

namespace py = pybind11;
using namespace bls;
using std::vector;


PYBIND11_MODULE(blspy, m)
Expand All @@ -46,9 +45,10 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to PrivateKey::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, PrivateKey::PRIVATE_KEY_SIZE> data;
std::copy(data_ptr, data_ptr + PrivateKey::PRIVATE_KEY_SIZE, data.data());
py::gil_scoped_release release;
return PrivateKey::FromByteVector(data);
return PrivateKey::FromBytes(data);
})
.def(
"__bytes__",
Expand Down Expand Up @@ -355,9 +355,8 @@ PYBIND11_MODULE(blspy, m)
return G1Element();
}))
.def(py::init(&G1Element::FromByteVector), py::call_guard<py::gil_scoped_release>())
.def(py::init(&G1Element::FromByteVectorUnchecked), py::call_guard<py::gil_scoped_release>())
.def(py::init([](py::int_ pyint) {
std::vector<uint8_t> buffer(G1Element::SIZE, 0);
std::array<uint8_t, G1Element::SIZE> buffer{};
if (_PyLong_AsByteArray(
(PyLongObject *)pyint.ptr(),
buffer.data(),
Expand All @@ -367,7 +366,7 @@ PYBIND11_MODULE(blspy, m)
throw std::invalid_argument("Failed to cast int to G1Element");
}
py::gil_scoped_release release;
return G1Element::FromByteVector(buffer);
return G1Element::FromBytes(buffer);
}))
.def(py::init([](py::buffer const b) {
py::buffer_info info = b.request();
Expand All @@ -380,9 +379,10 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G1Element::SIZE");
}
auto data_ptr = static_cast<uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, G1Element::SIZE> data;
std::copy(data_ptr, data_ptr + G1Element::SIZE, data.data());
py::gil_scoped_release release;
return G1Element::FromByteVector(data);
return G1Element::FromBytes(data);
}))
.def(
"from_bytes",
Expand All @@ -397,9 +397,10 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G1Element::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, G1Element::SIZE> data;
std::copy(data_ptr, data_ptr + G1Element::SIZE, data.data());
py::gil_scoped_release release;
return G1Element::FromByteVector(data);
return G1Element::FromBytes(data);
})
.def(
"from_bytes_unchecked",
Expand All @@ -414,9 +415,7 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G1Element::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
py::gil_scoped_release release;
return G1Element::FromByteVectorUnchecked(data);
return G1Element::FromBytesUnchecked({data_ptr, G1Element::SIZE});
})
.def("generator", &G1Element::Generator)
.def("from_message", py::overload_cast<const std::vector<uint8_t>&, const uint8_t*, int>(&G1Element::FromMessage), py::call_guard<py::gil_scoped_release>())
Expand Down Expand Up @@ -498,7 +497,6 @@ PYBIND11_MODULE(blspy, m)
return G2Element();
}))
.def(py::init(&G2Element::FromByteVector), py::call_guard<py::gil_scoped_release>())
.def(py::init(&G2Element::FromByteVectorUnchecked), py::call_guard<py::gil_scoped_release>())
.def(py::init([](py::buffer const b) {
py::buffer_info info = b.request();
if (info.format != py::format_descriptor<uint8_t>::format() ||
Expand All @@ -510,12 +508,13 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G2Element::SIZE");
}
auto data_ptr = static_cast<uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, G2Element::SIZE> data;
std::copy(data_ptr, data_ptr + G2Element::SIZE, data.data());
py::gil_scoped_release release;
return G2Element::FromByteVector(data);
return G2Element::FromBytes(data);
}))
.def(py::init([](py::int_ pyint) {
std::vector<uint8_t> buffer(G2Element::SIZE, 0);
std::array<uint8_t, G2Element::SIZE> buffer{};
if (_PyLong_AsByteArray(
(PyLongObject *)pyint.ptr(),
buffer.data(),
Expand All @@ -525,7 +524,7 @@ PYBIND11_MODULE(blspy, m)
throw std::invalid_argument("Failed to cast int to G2Element");
}
py::gil_scoped_release release;
return G2Element::FromByteVector(buffer);
return G2Element::FromBytes(buffer);
}))
.def(
"from_bytes",
Expand All @@ -540,9 +539,10 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G2Element::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, G2Element::SIZE> data;
std::copy(data_ptr, data_ptr + G2Element::SIZE, data.data());
py::gil_scoped_release release;
return G2Element::FromByteVector(data);
return G2Element::FromBytes(data);
})
.def(
"from_bytes_unchecked",
Expand All @@ -557,9 +557,7 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G2Element::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
py::gil_scoped_release release;
return G2Element::FromByteVector(data);
return G2Element::FromBytesUnchecked({data_ptr, G2Element::SIZE});
})
.def("generator", &G2Element::Generator)
.def("from_message", py::overload_cast<const std::vector<uint8_t>&, const uint8_t*, int>(&G2Element::FromMessage), py::call_guard<py::gil_scoped_release>())
Expand Down Expand Up @@ -642,12 +640,13 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to G2Element::SIZE");
}
auto data_ptr = static_cast<uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, GTElement::SIZE> data;
std::copy(data_ptr, data_ptr + GTElement::SIZE, data.data());
py::gil_scoped_release release;
return GTElement::FromByteVector(data);
return GTElement::FromBytes(data);
}))
.def(py::init([](py::int_ pyint) {
std::vector<uint8_t> buffer(GTElement::SIZE, 0);
std::array<uint8_t, G1Element::SIZE> buffer{};
if (_PyLong_AsByteArray(
(PyLongObject *)pyint.ptr(),
buffer.data(),
Expand All @@ -657,7 +656,7 @@ PYBIND11_MODULE(blspy, m)
throw std::invalid_argument("Failed to cast int to GTElement");
}
py::gil_scoped_release release;
return GTElement::FromByteVector(buffer);
return GTElement::FromBytes(buffer);
}))
.def(
"from_bytes",
Expand All @@ -672,9 +671,10 @@ PYBIND11_MODULE(blspy, m)
"Length of bytes object not equal to GTElement::SIZE");
}
auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
std::vector<uint8_t> data(data_ptr, data_ptr + info.size);
std::array<uint8_t, GTElement::SIZE> data;
std::copy(data_ptr, data_ptr + GTElement::SIZE, data.data());
py::gil_scoped_release release;
return GTElement::FromByteVector(data);
return GTElement::FromBytes(data);
})
.def("unity", &GTElement::Unity)
.def(py::self == py::self)
Expand Down
19 changes: 4 additions & 15 deletions src/elements.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ namespace bls {

const size_t G1Element::SIZE;

G1Element G1Element::FromBytes(const Bytes& bytes) {
G1Element G1Element::FromBytes(Bytes const bytes) {
G1Element ele = G1Element::FromBytesUnchecked(bytes);
ele.CheckValid();
return ele;
}

G1Element G1Element::FromBytesUnchecked(const Bytes& bytes)
G1Element G1Element::FromBytesUnchecked(Bytes const bytes)
{
if (bytes.size() != SIZE) {
throw std::invalid_argument("G1Element::FromBytes: Invalid size");
Expand Down Expand Up @@ -73,11 +73,6 @@ G1Element G1Element::FromByteVector(const std::vector<uint8_t>& bytevec)
return G1Element::FromBytes(Bytes(bytevec));
}

G1Element G1Element::FromByteVectorUnchecked(const std::vector<uint8_t>& bytevec)
{
return G1Element::FromBytesUnchecked(Bytes(bytevec));
}

G1Element G1Element::FromNative(const g1_t element)
{
G1Element ele;
Expand Down Expand Up @@ -212,13 +207,13 @@ G1Element operator*(const bn_t& k, const G1Element& a) { return a * k; }

const size_t G2Element::SIZE;

G2Element G2Element::FromBytes(const Bytes& bytes) {
G2Element G2Element::FromBytes(Bytes const bytes) {
G2Element ele = G2Element::FromBytesUnchecked(bytes);
ele.CheckValid();
return ele;
}

G2Element G2Element::FromBytesUnchecked(const Bytes& bytes)
G2Element G2Element::FromBytesUnchecked(Bytes const bytes)
{
if (bytes.size() != SIZE) {
throw std::invalid_argument("G2Element::FromBytes: Invalid size");
Expand Down Expand Up @@ -270,12 +265,6 @@ G2Element G2Element::FromByteVector(const std::vector<uint8_t>& bytevec)
return G2Element::FromBytes(Bytes(bytevec));
}

G2Element G2Element::FromByteVectorUnchecked(const std::vector<uint8_t>& bytevec)
{
return G2Element::FromBytesUnchecked(Bytes(bytevec));
}


G2Element G2Element::FromNative(const g2_t element)
{
G2Element ele;
Expand Down
10 changes: 4 additions & 6 deletions src/elements.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ class G1Element {
g1_set_infty(p);
}

static G1Element FromBytes(const Bytes& bytes);
static G1Element FromBytesUnchecked(const Bytes& bytes);
static G1Element FromBytes(Bytes bytes);
static G1Element FromBytesUnchecked(Bytes bytes);
static G1Element FromByteVector(const std::vector<uint8_t> &bytevec);
static G1Element FromByteVectorUnchecked(const std::vector<uint8_t> &bytevec);
static G1Element FromNative(const g1_t element);
static G1Element FromMessage(const std::vector<uint8_t> &message,
const uint8_t *dst,
Expand Down Expand Up @@ -82,10 +81,9 @@ class G2Element {
g2_set_infty(q);
}

static G2Element FromBytes(const Bytes& bytes);
static G2Element FromBytesUnchecked(const Bytes& bytes);
static G2Element FromBytes(Bytes bytes);
static G2Element FromBytesUnchecked(Bytes bytes);
static G2Element FromByteVector(const std::vector<uint8_t> &bytevec);
static G2Element FromByteVectorUnchecked(const std::vector<uint8_t> &bytevec);
static G2Element FromNative(const g2_t element);
static G2Element FromMessage(const std::vector<uint8_t>& message,
const uint8_t* dst,
Expand Down
10 changes: 8 additions & 2 deletions src/util.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <sstream>
#include <string>
#include <vector>
#include <array>

namespace bls {

Expand All @@ -30,14 +31,19 @@ class Bytes {
const size_t nSize;

public:
explicit Bytes(const uint8_t* pDataIn, const size_t nSizeIn)
Bytes(const uint8_t* pDataIn, const size_t nSizeIn)
: pData(pDataIn), nSize(nSizeIn)
{
}
explicit Bytes(const std::vector<uint8_t>& vecBytes)
Bytes(const std::vector<uint8_t>& vecBytes)
: pData(vecBytes.data()), nSize(vecBytes.size())
{
}
template <size_t N>
Bytes(const std::array<uint8_t, N>& a)
: pData(a.data()), nSize(N)
{
}

inline const uint8_t* begin() const { return pData; }
inline const uint8_t* end() const { return pData + nSize; }
Expand Down

0 comments on commit 51d8973

Please sign in to comment.