From a0e4966fde484c59b3ddde1aab5e3f194b7060cc Mon Sep 17 00:00:00 2001
From: Axel Benjaminsson <axel.benjaminsson@live.se>
Date: Wed, 29 Nov 2023 19:34:20 +0100
Subject: [PATCH] Remove BLAKE3 submodule

BLAKE3 is not used. This commit removes build flags associated with blake3
and removes the git submodule.
---
 .gitmodules    |  4 ----
 BLAKE3         |  1 -
 SConstruct     | 16 ++--------------
 src/pubkey.cpp |  1 -
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 160000 BLAKE3

diff --git a/.gitmodules b/.gitmodules
index 0fc6d2c2..0d21502e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp
 	branch = 4.1
-[submodule "BLAKE3"]
-	path = BLAKE3
-	url = git@github.com:BLAKE3-team/BLAKE3.git
-	ignore=untracked
 [submodule "ed25519"]
 	path = ed25519
 	url = git@github.com:orlp/ed25519.git
diff --git a/BLAKE3 b/BLAKE3
deleted file mode 160000
index 5aa53f07..00000000
--- a/BLAKE3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5aa53f07f7188a569cadfc5daf1522972d9a9630
diff --git a/SConstruct b/SConstruct
index 38871a66..52cd7738 100644
--- a/SConstruct
+++ b/SConstruct
@@ -118,25 +118,13 @@ env = SConscript("godot-cpp/SConstruct")
 env.Append(CPPPATH=["src/"])
 env.Append(CPPPATH=["include/"])
 env.Append(CPPPATH=["sha256/"])
-env.Append(CPPPATH=["BLAKE3/c/"])
 env.Append(CPPPATH=["ed25519/src/"])
 env.Append(CPPPATH=["phantom/"])
 env.Append(CPPPATH=["instructions/include"])
 env.Append(CPPPATH=["instructions/src"])
-env.Append(CCFLAGS=[
-    "-DBLAKE3_NO_SSE41",
-    "-DBLAKE3_NO_SSE2",
-    "-DBLAKE3_NO_AVX512",
-    "-DBLAKE3_NO_AVX2",
-    "-DBLAKE3_USE_NEON=0",
-])
 
 sources = Glob("src/*.cpp")
 
-blak3_sources = Glob("BLAKE3/c/blake3.c")
-blak3_sources.append(Glob("BLAKE3/c/blake3_dispatch.c")[0])
-blak3_sources.append(Glob("BLAKE3/c/blake3_portable.c")[0])
-
 sha256_sources = Glob("sha256/sha256.cpp")
 ed25519_sources = Glob("ed25519/src/*.c")
 
@@ -178,12 +166,12 @@ else:
             ) + LIBRARY_NAME + ".{}.{}".format(
                 env["platform"], env["target"]
             ),
-            source=sources + blak3_sources + sha256_sources + ed25519_sources + phantom_sources + instruction_sources,
+            source=sources + sha256_sources + ed25519_sources + phantom_sources + instruction_sources,
         )
     else:
         library = env.SharedLibrary(
             "bin/lib" + LIBRARY_NAME + "{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
-            source=sources + blak3_sources + sha256_sources + ed25519_sources + phantom_sources + instruction_sources,
+            source=sources + sha256_sources + ed25519_sources + phantom_sources + instruction_sources,
         )
 
     Default(library)
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index f2335c19..45b7d20e 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -3,7 +3,6 @@
 
 #include <solana_sdk.hpp>
 #include <godot_cpp/core/class_db.hpp>
-#include "blake3.h"
 #include "sha256.hpp"
 
 #include "curve25519.hpp"