Merge pull request #26 from ChainSafe/upstream-blstwrappy

Upstream blst_wrap.py fixes
ChainSafe · Dec 22, 2020 · c55d11e · c55d11e
2 parents a3acb20 + 2186191
commit c55d11e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 72 deletions.
diff --git a/blst b/blst
diff --git a/blst_wrap.py b/blst_wrap.py
diff --git a/src/scripts/buildBindings.ts b/src/scripts/buildBindings.ts
@@ -8,8 +8,6 @@ import {
   findBindingsFile,
   BINDINGS_DIR,
   BLST_WRAP_CPP_PREBUILD,
-  BLST_WRAP_PY_PATCH,
-  BLST_WRAP_PY_FILE,
 } from "./paths";
 
 export async function buildBindings(binaryPath: string) {
@@ -37,9 +35,6 @@ export async function buildBindings(binaryPath: string) {
     }
   }
 
-  // Copy patched blst_wrap.py and bindings.gyp
-  fs.copyFileSync(BLST_WRAP_PY_PATCH, BLST_WRAP_PY_FILE);
-
   // From https://github.com/sass/node-sass/blob/769f3a6f5a3949bd8e69c6b0a5d385a9c07924b4/scripts/build.js#L59
   const nodeJsExec = process.execPath;
   const nodeGypExec = require.resolve(

diff --git a/src/scripts/paths.ts b/src/scripts/paths.ts
@@ -16,10 +16,6 @@ export const BLST_WRAP_CPP_PREBUILD = path.resolve(
   "blst_wrap.cpp"
 );
 
-// Paths for custom python script to build blst_wrap.cpp
-export const BLST_WRAP_PY_PATCH = path.join(ROOT_DIR, "blst_wrap.py");
-export const BLST_WRAP_PY_FILE = path.join(BINDINGS_DIR, "blst_wrap.py");
-
 /**
  * Get binary name.
  * name: {platform}-{arch}-{v8 version}.node
+1 −1		.travis.yml
+4 −4		bindings/blst.h
+40 −10		bindings/blst.hpp
+40 −3		bindings/blst.swg
+6 −0		bindings/blst_aux.h
+24 −22		bindings/go/blst.go
+12 −10		bindings/go/blst.tgo
+6 −6		bindings/go/blst_px.tgo
+149 −0		bindings/go/rb_tree.go
+24 −8		bindings/node.js/blst_wrap.py
+32 −14		bindings/rust/src/bindings.rs
+23 −0		bindings/rust/src/lib.rs
+1 −1		build/bindings_trim.pl
+1 −0		build/refresh.sh
+3 −0		build/win64/blst.def
+145 −0		src/rb_tree.c
+1 −0		src/server.c