Skip to content

Commit 386a4c1

Browse files
authored
Remove host subprocess API (#7413)
1 parent 4852f79 commit 386a4c1

File tree

22 files changed

+10
-763
lines changed

22 files changed

+10
-763
lines changed

.github/workflows/long-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
run: |
120120
set +x
121121
cd build
122-
setarch -R ./tests.sh --output-on-failure --timeout 3600 -LE "benchmark" -E "launch_host_process|recovery|regression|governance|membership"
122+
setarch -R ./tests.sh --output-on-failure --timeout 3600 -LE "benchmark" -E "recovery|regression|governance|membership"
123123
124124
- name: "Upload logs"
125125
if: success() || failure()

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [7.0.0-dev5]
9+
10+
[7.0.0-dev5]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev5
11+
12+
### Removed
13+
14+
- Removed the unused experimental `ccf.host.triggerSubprocess()` JS API
15+
816
## [7.0.0-dev4]
917

1018
[7.0.0-dev4]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev4

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ add_ccf_static_library(
237237
${CCF_DIR}/src/js/extensions/ccf/gov.cpp
238238
${CCF_DIR}/src/js/extensions/ccf/gov_effects.cpp
239239
${CCF_DIR}/src/js/extensions/ccf/historical.cpp
240-
${CCF_DIR}/src/js/extensions/ccf/host.cpp
241240
${CCF_DIR}/src/js/extensions/ccf/kv.cpp
242241
${CCF_DIR}/src/js/extensions/ccf/network.cpp
243242
${CCF_DIR}/src/js/extensions/ccf/node.cpp
@@ -931,14 +930,6 @@ if(BUILD_TESTS)
931930
${CMAKE_SOURCE_DIR}/tests
932931
)
933932

934-
add_e2e_test(
935-
NAME launch_host_process_test
936-
PYTHON_SCRIPT
937-
${CMAKE_SOURCE_DIR}/tests/js-launch-host-process/host_process.py
938-
ADDITIONAL_ARGS --js-app-bundle
939-
${CMAKE_SOURCE_DIR}/tests/js-launch-host-process
940-
)
941-
942933
set(CONSTITUTION_ARGS
943934
--constitution
944935
${CCF_DIR}/samples/constitutions/default/actions.js

include/ccf/js/core/context.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
namespace ccf
1919
{
2020
class AbstractGovernanceEffects;
21-
class AbstractHostProcesses;
2221
struct NetworkState;
2322
class RpcContext;
2423
class BaseEndpointRegistry;

include/ccf/js/extensions/ccf/host.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

include/ccf/node/host_processes_interface.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "ccf"
7-
version = "7.0.0-dev4"
7+
version = "7.0.0-dev5"
88
authors = [
99
{ name="CCF Team", email="[email protected]" },
1010
]

src/enclave/enclave.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "node/rpc/custom_protocol_subsystem.h"
2626
#include "node/rpc/forwarder.h"
2727
#include "node/rpc/gov_effects.h"
28-
#include "node/rpc/host_processes.h"
2928
#include "node/rpc/member_frontend.h"
3029
#include "node/rpc/network_identity_subsystem.h"
3130
#include "node/rpc/node_frontend.h"
@@ -72,7 +71,6 @@ namespace ccf
7271
nullptr;
7372
std::shared_ptr<ccf::indexing::Indexer> indexer = nullptr;
7473
std::shared_ptr<ccf::indexing::EnclaveLFSAccess> lfs_access = nullptr;
75-
std::shared_ptr<ccf::HostProcesses> host_processes = nullptr;
7674

7775
public:
7876
Enclave(
@@ -124,7 +122,6 @@ namespace ccf
124122
writer_factory->create_writer_to_outside());
125123
context->install_subsystem(lfs_access);
126124

127-
context->install_subsystem(std::make_shared<ccf::HostProcesses>(*node));
128125
context->install_subsystem(std::make_shared<ccf::NodeOperation>(*node));
129126
context->install_subsystem(
130127
std::make_shared<ccf::GovernanceEffects>(*node));

src/enclave/interface.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,3 @@ DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop_notice);
3636
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stopped);
3737
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::tick);
3838
DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(AdminMessage::work_stats, std::string);
39-
40-
/// Messages sent from app endpoints
41-
enum AppMessage : ringbuffer::Message
42-
{
43-
/// Start an arbitrary process on the host. Enclave -> Host
44-
DEFINE_RINGBUFFER_MSG_TYPE(launch_host_process)
45-
};
46-
47-
DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(
48-
AppMessage::launch_host_process, std::string, std::vector<uint8_t>);
49-
50-
struct HostProcessArguments
51-
{
52-
std::vector<std::string> args;
53-
};
54-
55-
DECLARE_JSON_TYPE(HostProcessArguments);
56-
DECLARE_JSON_REQUIRED_FIELDS(HostProcessArguments, args);

0 commit comments

Comments
 (0)