status-im/c-kzg-4844
2
0
Fork 0
mirror of https://github.com/status-im/c-kzg-4844.git synced 2025-02-18 13:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove try macro & convert remaining uses

Browse Source
This commit is contained in:
Justin Traglia 2022-12-19 13:11:45 -06:00
parent 3a17ea68a0
commit 4999bd85e1
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/c_kzg_4844.c
View File

@ -40,13 +40,6 @@ static C_KZG_RET c_kzg_malloc(void **x, size_t n) {
#define CHECK(cond) \ #define CHECK(cond) \
if (!(cond)) return C_KZG_BADARGS if (!(cond)) return C_KZG_BADARGS
#define TRY(result) \
{ \
C_KZG_RET ret = (result); \
if (ret == C_KZG_MALLOC) return ret; \
if (ret != C_KZG_OK) return C_KZG_ERROR; \
}
/** /**
* Allocate memory for an array of G1 group elements. * Allocate memory for an array of G1 group elements.
* *
@ -265,11 +258,13 @@ static void fr_inv(fr_t *out, const fr_t *a) {
* @param[in] len Length * @param[in] len Length
*/ */
static C_KZG_RET fr_batch_inv(fr_t *out, const fr_t *a, size_t len) { static C_KZG_RET fr_batch_inv(fr_t *out, const fr_t *a, size_t len) {
fr_t *prod; C_KZG_RET ret;
fr_t *prod = NULL;
fr_t inv; fr_t inv;
size_t i; size_t i;
TRY(new_fr_array(&prod, len)); ret = new_fr_array(&prod, len);
if (ret != C_KZG_OK) goto free_out;
prod[0] = a[0]; prod[0] = a[0];
@ -285,8 +280,8 @@ static C_KZG_RET fr_batch_inv(fr_t *out, const fr_t *a, size_t len) {
} }
out[0] = inv; out[0] = inv;
free(prod); free_out:
if (prod != NULL) free(prod);
return C_KZG_OK; return C_KZG_OK;
} }
@ -1065,18 +1060,19 @@ free_out:
* @retval C_KZG_MALLOC Memory allocation failed * @retval C_KZG_MALLOC Memory allocation failed
*/ */
static C_KZG_RET compute_kzg_proof(KZGProof *out, const Polynomial p, const BLSFieldElement *x, const KZGSettings *s) { static C_KZG_RET compute_kzg_proof(KZGProof *out, const Polynomial p, const BLSFieldElement *x, const KZGSettings *s) {
C_KZG_RET ret = C_KZG_OK; C_KZG_RET ret;
BLSFieldElement y; BLSFieldElement y;
TRY(evaluate_polynomial_in_evaluation_form(&y, p, x, s)); fr_t *inverses_in = NULL;
fr_t *inverses = NULL;
ret = evaluate_polynomial_in_evaluation_form(&y, p, x, s);
if (ret != C_KZG_OK) goto free_out;
fr_t tmp; fr_t tmp;
Polynomial q; Polynomial q;
const fr_t *roots_of_unity = s->fs->roots_of_unity; const fr_t *roots_of_unity = s->fs->roots_of_unity;
uint64_t i, m = 0; uint64_t i, m = 0;
fr_t *inverses_in = NULL;
fr_t *inverses = NULL;
ret = new_fr_array(&inverses_in, FIELD_ELEMENTS_PER_BLOB); ret = new_fr_array(&inverses_in, FIELD_ELEMENTS_PER_BLOB);
if (ret != C_KZG_OK) goto free_out; if (ret != C_KZG_OK) goto free_out;
ret = new_fr_array(&inverses, FIELD_ELEMENTS_PER_BLOB); ret = new_fr_array(&inverses, FIELD_ELEMENTS_PER_BLOB);
@ -1225,13 +1221,24 @@ C_KZG_RET compute_aggregate_kzg_proof(KZGProof *out,
const Blob blobs[], const Blob blobs[],
size_t n, size_t n,
const KZGSettings *s) { const KZGSettings *s) {
KZGCommitment* commitments = calloc(n, sizeof(KZGCommitment));
if (0 < n && commitments == NULL) return C_KZG_MALLOC;
Polynomial* polys = calloc(n, sizeof(Polynomial));
if (0 < n && polys == NULL) { free(commitments); return C_KZG_MALLOC; }
C_KZG_RET ret; C_KZG_RET ret;
Polynomial* polys = NULL;
KZGCommitment* commitments = NULL;
commitments = calloc(n, sizeof(KZGCommitment));
if (0 < n && commitments == NULL)
{
ret = C_KZG_MALLOC;
goto error_free_out;
}
polys = calloc(n, sizeof(Polynomial));
if (0 < n && polys == NULL)
{
ret = C_KZG_MALLOC;
goto error_free_out;
}
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
ret = poly_from_blob(polys[i], blobs[i]); ret = poly_from_blob(polys[i], blobs[i]);
if (ret != C_KZG_OK) goto error_free_out; if (ret != C_KZG_OK) goto error_free_out;