From bcf678e434668332277d0d04deb46609ad2c3407 Mon Sep 17 00:00:00 2001
From: Amaury Chamayou <amchamay@microsoft.com>
Date: Sun, 7 Jul 2024 11:55:40 +0100
Subject: [PATCH] Module loader implementations do not need to be public
 (#6336)

---
 src/apps/js_generic/js_generic_base.cpp                     | 6 +++---
 src/js/extensions/ccf/gov_effects.cpp                       | 2 +-
 {include/ccf => src}/js/modules/chained_module_loader.h     | 0
 {include/ccf => src}/js/modules/kv_bytecode_module_loader.h | 0
 {include/ccf => src}/js/modules/kv_module_loader.h          | 0
 src/js/registry.cpp                                         | 6 +++---
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename {include/ccf => src}/js/modules/chained_module_loader.h (100%)
 rename {include/ccf => src}/js/modules/kv_bytecode_module_loader.h (100%)
 rename {include/ccf => src}/js/modules/kv_module_loader.h (100%)

diff --git a/src/apps/js_generic/js_generic_base.cpp b/src/apps/js_generic/js_generic_base.cpp
index ad543b58c8db..ea1f5e789ffc 100644
--- a/src/apps/js_generic/js_generic_base.cpp
+++ b/src/apps/js_generic/js_generic_base.cpp
@@ -16,14 +16,14 @@
 #include "ccf/js/extensions/ccf/request.h"
 #include "ccf/js/extensions/ccf/rpc.h"
 #include "ccf/js/interpreter_cache_interface.h"
-#include "ccf/js/modules/chained_module_loader.h"
-#include "ccf/js/modules/kv_bytecode_module_loader.h"
-#include "ccf/js/modules/kv_module_loader.h"
 #include "ccf/node/host_processes_interface.h"
 #include "ccf/service/tables/jsengine.h"
 #include "ccf/version.h"
 #include "enclave/enclave_time.h"
 #include "js/global_class_ids.h"
+#include "js/modules/chained_module_loader.h"
+#include "js/modules/kv_bytecode_module_loader.h"
+#include "js/modules/kv_module_loader.h"
 #include "node/rpc_context_impl.h"
 #include "service/tables/endpoints.h"
 
diff --git a/src/js/extensions/ccf/gov_effects.cpp b/src/js/extensions/ccf/gov_effects.cpp
index 978fb72ba934..384100b1b66f 100644
--- a/src/js/extensions/ccf/gov_effects.cpp
+++ b/src/js/extensions/ccf/gov_effects.cpp
@@ -7,8 +7,8 @@
 #include "ccf/js/extensions/ccf/gov_effects.h"
 
 #include "ccf/js/core/context.h"
-#include "ccf/js/modules/kv_module_loader.h"
 #include "ccf/version.h"
+#include "js/modules/kv_module_loader.h"
 #include "node/rpc/jwt_management.h"
 
 #include <quickjs/quickjs.h>
diff --git a/include/ccf/js/modules/chained_module_loader.h b/src/js/modules/chained_module_loader.h
similarity index 100%
rename from include/ccf/js/modules/chained_module_loader.h
rename to src/js/modules/chained_module_loader.h
diff --git a/include/ccf/js/modules/kv_bytecode_module_loader.h b/src/js/modules/kv_bytecode_module_loader.h
similarity index 100%
rename from include/ccf/js/modules/kv_bytecode_module_loader.h
rename to src/js/modules/kv_bytecode_module_loader.h
diff --git a/include/ccf/js/modules/kv_module_loader.h b/src/js/modules/kv_module_loader.h
similarity index 100%
rename from include/ccf/js/modules/kv_module_loader.h
rename to src/js/modules/kv_module_loader.h
diff --git a/src/js/registry.cpp b/src/js/registry.cpp
index 2a067fc546ee..60bd636cae23 100644
--- a/src/js/registry.cpp
+++ b/src/js/registry.cpp
@@ -33,9 +33,9 @@
 #include "ccf/js/extensions/ccf/request.h"
 #include "ccf/js/extensions/ccf/rpc.h"
 #include "ccf/js/interpreter_cache_interface.h"
-#include "ccf/js/modules/chained_module_loader.h"
-#include "ccf/js/modules/kv_bytecode_module_loader.h"
-#include "ccf/js/modules/kv_module_loader.h"
+#include "js/modules/chained_module_loader.h"
+#include "js/modules/kv_bytecode_module_loader.h"
+#include "js/modules/kv_module_loader.h"
 #include "node/rpc_context_impl.h"
 
 namespace ccf::js