Simplify construction of JS globals (microsoft#5385)

(cherry picked from commit 2dc8cf2) # Conflicts: # src/node/rpc/member_frontend.h
achamayou · Oct 17, 2023 · 0c35044 · 0c35044
1 parent 08e2efb
commit 0c35044
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 401 deletions.
diff --git a/src/apps/js_generic/js_generic_base.cpp b/src/apps/js_generic/js_generic_base.cpp
@@ -283,18 +283,26 @@ namespace ccfapp
       js::ReadOnlyTxContext historical_txctx{historical_tx};
 
       js::register_request_body_class(ctx);
-      js::populate_global(
-        &txctx,
-        historical_tx ? &historical_txctx : nullptr,
-        endpoint_ctx.rpc_ctx.get(),
-        transaction_id,
-        receipt,
-        nullptr,
-        context.get_subsystem<ccf::AbstractHostProcesses>().get(),
-        nullptr,
-        &context.get_historical_state(),
-        this,
-        ctx);
+      js::init_globals(ctx);
+      js::populate_global_ccf_kv(&txctx, ctx);
+
+      if (historical_tx != nullptr)
+      {
+        CCF_ASSERT(
+          transaction_id.has_value(),
+          "Expected transaction_id to be passed with historical_tx");
+        CCF_ASSERT(
+          receipt != nullptr,
+          "Expected receipt to be passed with historical_tx");
+        js::populate_global_ccf_historical_state(
+          &historical_txctx, transaction_id.value(), receipt, ctx);
+      }
+
+      js::populate_global_ccf_rpc(endpoint_ctx.rpc_ctx.get(), ctx);
+      js::populate_global_ccf_host(
+        context.get_subsystem<ccf::AbstractHostProcesses>().get(), ctx);
+      js::populate_global_ccf_consensus(this, ctx);
+      js::populate_global_ccf_historical(&context.get_historical_state(), ctx);
 
       js::JSWrappedValue export_func;
       try