Commit 1d3e59f2 authored by gabi-250's avatar gabi-250 🕸️
Browse files

arti: Implement the hsc subcommand using an inert tor client. 

This allows us to reenable the `arti hsc` tests, which were previously
disabled due to flakiness (see #1496).

The `help` test bit rotted a bit, so I had to tweak its expected output.

Closes #1496
parent aa72f0c5

crates/arti/src/subcommands/hsc.rs

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ fn prepare_service_discovery_key<R: Runtime>( 
) -> Result<()> {

    let client = TorClient::with_runtime(runtime)

        .config(config.clone())

        .create_unbootstrapped()?;

        .create_inert()?;

    let key = match args.generate {

        GenerateKey::IfNeeded => {

            // TODO: consider using get_or_generate in generate_service_discovery_key

crates/arti/tests/cli_tests.rs

+2 −6
Original line number Diff line number Diff line
@@ -19,12 +19,8 @@ fn cli_tests() { 


    cfg_if::cfg_if! {

        if #[cfg(all(feature = "onion-service-client", feature = "experimental-api", feature = "keymgr"))] {

            // TODO: Skipped because running creating multiple TorClient at the same time

            // is not supported.

            //

            // Re-enable these when #1497 is closed.

            t.skip("tests/testcases/hsc/*.toml");

            t.skip("tests/testcases/hsc/*.md");

            t.case("tests/testcases/hsc/*.toml");

            t.case("tests/testcases/hsc/*.md");

        } else {

            // This is not yet implemented, see #1487

            t.skip("tests/testcases/hsc-feature-missing/*.toml");

crates/arti/tests/testcases/hsc/help.stdout

+1 −1

File changed.

Contains only whitespace changes.