Module loader implementations do not need to be public (#6336)

microsoft · Jul 7, 2024 · bcf678e · bcf678e
1 parent 423a06e
commit bcf678e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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/...de/ccf/js/modules/chained_module_loader.h → src/js/modules/chained_module_loader.h b/...de/ccf/js/modules/chained_module_loader.h → src/js/modules/chained_module_loader.h
diff --git a/...cf/js/modules/kv_bytecode_module_loader.h → src/js/modules/kv_bytecode_module_loader.h b/...cf/js/modules/kv_bytecode_module_loader.h → src/js/modules/kv_bytecode_module_loader.h
diff --git a/include/ccf/js/modules/kv_module_loader.h → src/js/modules/kv_module_loader.h b/include/ccf/js/modules/kv_module_loader.h → src/js/modules/kv_module_loader.h
diff --git 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