Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/long-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
run: |
set +x
cd build
setarch -R ./tests.sh --output-on-failure --timeout 3600 -LE "benchmark" -E "launch_host_process|recovery|regression|governance|membership"
setarch -R ./tests.sh --output-on-failure --timeout 3600 -LE "benchmark" -E "recovery|regression|governance|membership"

- name: "Upload logs"
if: success() || failure()
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [7.0.0-dev5]

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

### Removed

- Removed the unused experimental `ccf.host.triggerSubprocess()` JS API

## [7.0.0-dev4]

[7.0.0-dev4]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev4
Expand Down
9 changes: 0 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ add_ccf_static_library(
${CCF_DIR}/src/js/extensions/ccf/gov.cpp
${CCF_DIR}/src/js/extensions/ccf/gov_effects.cpp
${CCF_DIR}/src/js/extensions/ccf/historical.cpp
${CCF_DIR}/src/js/extensions/ccf/host.cpp
${CCF_DIR}/src/js/extensions/ccf/kv.cpp
${CCF_DIR}/src/js/extensions/ccf/network.cpp
${CCF_DIR}/src/js/extensions/ccf/node.cpp
Expand Down Expand Up @@ -931,14 +930,6 @@ if(BUILD_TESTS)
${CMAKE_SOURCE_DIR}/tests
)

add_e2e_test(
NAME launch_host_process_test
PYTHON_SCRIPT
${CMAKE_SOURCE_DIR}/tests/js-launch-host-process/host_process.py
ADDITIONAL_ARGS --js-app-bundle
${CMAKE_SOURCE_DIR}/tests/js-launch-host-process
)

set(CONSTITUTION_ARGS
--constitution
${CCF_DIR}/samples/constitutions/default/actions.js
Expand Down
1 change: 0 additions & 1 deletion include/ccf/js/core/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
namespace ccf
{
class AbstractGovernanceEffects;
class AbstractHostProcesses;
struct NetworkState;
class RpcContext;
class BaseEndpointRegistry;
Expand Down
25 changes: 0 additions & 25 deletions include/ccf/js/extensions/ccf/host.h

This file was deleted.

26 changes: 0 additions & 26 deletions include/ccf/node/host_processes_interface.h

This file was deleted.

2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "ccf"
version = "7.0.0-dev4"
version = "7.0.0-dev5"
authors = [
{ name="CCF Team", email="[email protected]" },
]
Expand Down
3 changes: 0 additions & 3 deletions src/enclave/enclave.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "node/rpc/custom_protocol_subsystem.h"
#include "node/rpc/forwarder.h"
#include "node/rpc/gov_effects.h"
#include "node/rpc/host_processes.h"
#include "node/rpc/member_frontend.h"
#include "node/rpc/network_identity_subsystem.h"
#include "node/rpc/node_frontend.h"
Expand Down Expand Up @@ -72,7 +71,6 @@ namespace ccf
nullptr;
std::shared_ptr<ccf::indexing::Indexer> indexer = nullptr;
std::shared_ptr<ccf::indexing::EnclaveLFSAccess> lfs_access = nullptr;
std::shared_ptr<ccf::HostProcesses> host_processes = nullptr;

public:
Enclave(
Expand Down Expand Up @@ -124,7 +122,6 @@ namespace ccf
writer_factory->create_writer_to_outside());
context->install_subsystem(lfs_access);

context->install_subsystem(std::make_shared<ccf::HostProcesses>(*node));
context->install_subsystem(std::make_shared<ccf::NodeOperation>(*node));
context->install_subsystem(
std::make_shared<ccf::GovernanceEffects>(*node));
Expand Down
18 changes: 0 additions & 18 deletions src/enclave/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,3 @@ DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop_notice);
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stopped);
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::tick);
DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(AdminMessage::work_stats, std::string);

/// Messages sent from app endpoints
enum AppMessage : ringbuffer::Message
{
/// Start an arbitrary process on the host. Enclave -> Host
DEFINE_RINGBUFFER_MSG_TYPE(launch_host_process)
};

DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(
AppMessage::launch_host_process, std::string, std::vector<uint8_t>);

struct HostProcessArguments
{
std::vector<std::string> args;
};

DECLARE_JSON_TYPE(HostProcessArguments);
DECLARE_JSON_REQUIRED_FIELDS(HostProcessArguments, args);
Loading