Remove stale cchost mentions across tests, samples, schema, and host config#7883
Remove stale cchost mentions across tests, samples, schema, and host config#7883Copilot wants to merge 7 commits into
cchost mentions across tests, samples, schema, and host config#7883Conversation
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/490c0f29-f328-442f-b280-591c6a302c40 Co-authored-by: maxtropets <16566519+maxtropets@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/16102018-130f-491a-87f7-26ad84e003bf Co-authored-by: maxtropets <16566519+maxtropets@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/944eaa0f-7d80-4808-b871-e5a88fd00c0e Co-authored-by: maxtropets <16566519+maxtropets@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
This PR removes stale references to the deprecated cchost entrypoint across the repo (tests/infra, samples, and the host config schema/docs), reflecting the 7.x+ model where each app is its own executable. It also renames the host config schema file and the corresponding C++ config struct to remove cchost-specific naming.
Changes:
- Update Python test/infra comments and CLI help to refer to “node” rather than
cchost, and adjustCCFRemotecomments/defaults. - Rename host config schema to
host_config.jsonand update build/docs wiring; renamehost::CCHostConfigtohost::HostConfig. - Update
samples/minimal_ccfscripts/config naming and remove a Dockerfile step that staged/usr/bin/cchost.
Custom instructions used:
.github/copilot-instructions.md.github/instructions/reviewing.instructions.md
Reviewed changes
Copilot reviewed 13 out of 15 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/lts_compatibility.py | Update comment referring to node defaults. |
| tests/infra/runner.py | Update comments referring to node defaults. |
| tests/infra/remote.py | Adjust CCFRemote.BIN default/comment and inline note for 7.x+. |
| tests/infra/piccolo_driver.py | Update comment referring to node defaults. |
| tests/infra/e2e_args.py | Update --binary-dir help text to refer to node executable. |
| tests/historical_query_perf.py | Update comment referring to node defaults. |
| tests/historical_query_cache.py | Update comment referring to node defaults. |
| src/host/run.cpp | Rename config type usage from CCHostConfig to HostConfig. |
| src/host/configuration.h | Rename host::CCHostConfig struct to host::HostConfig and JSON declarations accordingly. |
| samples/minimal_ccf/run_app.sh | Switch sample invocation from cchost to js_generic and rename config reference. |
| samples/minimal_ccf/ccf_runtime/Dockerfile | Remove step that moved cchost into /usr/bin. |
| samples/minimal_ccf/app/config_virtual_js.json | Add/rename sample config JSON for minimal sample. |
| doc/host_config_schema/host_config.json | Add/rename host config JSON schema under new name. |
| doc/conf.py | Point schema-based doc generation to host_config.json. |
| CMakeLists.txt | Point embedded/installed schema source to host_config.json. |
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/0a183e74-f64f-4978-9771-7977aa95667e Co-authored-by: achamayou <4016369+achamayou@users.noreply.github.com>
achamayou
left a comment
There was a problem hiding this comment.
Thank you for tidying this up, there are a couple of niggles but this is going in the right direction.
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/b59a5b76-ce53-4ca6-a87f-bbd792a86407 Co-authored-by: maxtropets <16566519+maxtropets@users.noreply.github.com>
|
Run set -ex
Run formatting script in the way we do in CI, fix this PR Create a separate PR with your review instructions or skils edited in such a way thay you never forget doing this again (I'm angry) |
|
@maxtropets I've opened a new pull request, #7884, to work on those changes. Once the pull request is ready, I'll request review from you. |
That PR is against main now , as it should be. Formatting to be fixed in this PR, as per CI.yml |
|
@maxtropets I've opened a new pull request, #7886, to work on those changes. Once the pull request is ready, I'll request review from you. |
|
@copilot do not wait for any other PRs, they are not blocking this. Fix formatting in this PR by looking into ci.yml to see how it's done. |
Agent-Logs-Url: https://github.com/microsoft/CCF/sessions/3276533c-eba0-4d87-ab5d-d9a7791c9a5c Co-authored-by: maxtropets <16566519+maxtropets@users.noreply.github.com>
Fixed in 379f54a — ran |
The
cchostbinary was removed in 7.x (each app is now its own executable), but stale references remained throughout the tree.Tests / infra (Python)
# Set to cchost default valuecomments with# Set to node default valueintests/infra/{runner,piccolo_driver}.py,tests/historical_query_{perf,cache}.py,tests/lts_compatibility.py.--binary-dirhelp text intests/infra/e2e_args.py.CCFRemote.BIN = ""class attribute and instead require the binary name on construction: added abinary_namekeyword argument toCCFRemote.__init__. Formajor_version >= 7(or unspecified), the binary isenclave_file; formajor_version < 7,binary_nameis asserted to be set and resolved viabuild_bin_path.infra.node.Nodepassesbinary_name="cchost"for pre-7 nodes.Host config schema
doc/host_config_schema/cchost_config.json→host_config.json; updateCMakeLists.txtanddoc/conf.py.host::CCHostConfig→host::HostConfig(only used insrc/host/configuration.handsrc/host/run.cpp).samples/minimal_ccfmv .../bin/cchost /usr/bin/cchoststep from the runtime Dockerfile and replace it with amv .../bin/js_generic /usr/bin/js_genericstep, with a comment notingjs_genericis a sample application binary intended to be replaced with the actual application binary when adapting the image.cchostinvocation inrun_app.shwithjs_generic.cchost_config_virtual_js.json→config_virtual_js.json.Intentionally retained
CHANGELOG.mdhistorical entries.tests/infra/remote.py__init__explaining the 7.x binary consolidation (kept per review feedback).