Split core implementation into multiple files (#464)

.github/workflows/c-tests.yml

@@ -37,9 +37,7 @@ jobs:
           check-path: 'src'
           exclude-regex: 'tinytest.h'
 
-      # Build and test.
-      - name: Build
-        run: make test_c_kzg_4844
+      # Run tests.
       - name: Test
         run: make test
 

.gitignore

@@ -1,5 +1,5 @@
-test_c_kzg_4844
-test_c_kzg_4844_*
+src/tests
+src/tests_*
 coverage.html
 analysis-report/
 *.profraw

MANIFEST.in

@@ -1,5 +1,5 @@
 # This is a manifest for the Python bindings
-include bindings/python/ckzg.c
+include bindings/python/ckzg_wrap.c
 include bindings/python/README.md
 recursive-include blst *
 recursive-include lib *

README.md

@@ -61,7 +61,7 @@ All the bindings are tested against the [KZG reference
 tests](https://github.com/ethereum/consensus-spec-tests/tree/master/tests/general/deneb/kzg),
 which are defined in the consensus-spec-tests. Additionally, a suite of unit
 tests for internal C functions is located
-[here](https://github.com/ethereum/c-kzg-4844/blob/main/src/test_c_kzg_4844.c).
+[here](https://github.com/ethereum/c-kzg-4844/blob/main/src/tests.c).
 
 ### Parallelization
 

bindings/csharp/Makefile

@@ -9,7 +9,7 @@ ifeq ($(OS),Windows_NT)
 	CLANG_EXECUTABLE = clang
 	EXTENSION ?= ".dll"
 	CKZG_LIBRARY_PATH = Ckzg.Bindings\runtimes\$(LOCATION)\native\ckzg$(EXTENSION)
-	CFLAGS += -Wl,/def:ckzg.def
+	CFLAGS += -Wl,/def:ckzg_wrap.def
 else
 	BLST_BUILDSCRIPT = ./build.sh
 	BLST_OBJ = libblst.a
@@ -39,7 +39,7 @@ else
 endif
 
 INCLUDE_DIRS = ../../src ../../blst/bindings
-TARGETS = ckzg.c ../../src/c_kzg_4844.c ../../blst/$(BLST_OBJ)
+TARGETS = ckzg_wrap.c ../../src/ckzg.c ../../blst/$(BLST_OBJ)
 
 CFLAGS += -O2 -Wall -Wextra -shared
 CFLAGS += ${addprefix -I,${INCLUDE_DIRS}}

bindings/csharp/ckzg_wrap.c

@@ -0,0 +1,30 @@
+#include "ckzg_wrap.h"
+#include <stdlib.h>
+
+KZGSettings *load_trusted_setup_wrap(const char *file, size_t precompute) {
+  KZGSettings *out = malloc(sizeof(KZGSettings));
+
+  if (out == NULL)
+    return NULL;
+
+  FILE *f = fopen(file, "r");
+
+  if (f == NULL) {
+    free(out);
+    return NULL;
+  }
+
+  if (load_trusted_setup_file(out, f, precompute) != C_KZG_OK) {
+    free(out);
+    fclose(f);
+    return NULL;
+  }
+
+  fclose(f);
+  return out;
+}
+
+void free_trusted_setup_wrap(KZGSettings *s) {
+  free_trusted_setup(s);
+  free(s);
+}

bindings/csharp/ckzg_wrap.h

@@ -0,0 +1,5 @@
+#include "ckzg.h"
+
+KZGSettings *load_trusted_setup_wrap(const char *file, size_t precompute);
+
+void free_trusted_setup_wrap(KZGSettings *s);

bindings/go/main.go

@@ -2,7 +2,7 @@ package ckzg4844
 
 // #cgo CFLAGS: -I${SRCDIR}/../../src
 // #cgo CFLAGS: -I${SRCDIR}/blst_headers
-// #include "c_kzg_4844.c"
+// #include "ckzg.c"
 import "C"
 
 import (

bindings/java/Makefile

@@ -1,6 +1,6 @@
 INCLUDE_DIRS = ../../src ../../blst/bindings
 
-TARGETS=c_kzg_4844_jni.c ../../src/c_kzg_4844.c ../../lib/libblst.a
+TARGETS=ckzg_jni.c ../../src/ckzg.c ../../lib/libblst.a
 
 CC_FLAGS=
 OPTIMIZATION_LEVEL=-O2