Skip to content

Commit

Permalink
Merge pull-request #468
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewkmin committed Jul 3, 2024
2 parents 63bbe43 + d76154b commit ea94d09
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LOCAL_EPH_PATH := ./local-enclave/qos.ephemeral.key
.PHONY: local-enclave
local-enclave:
@# Remove the directory where we default to setting up the enclave file system
rm -rf ./local-encalve
rm -rf ./local-enclave
@# Start the enclave with mock feature and mock flag so we can use the MockNSM
cargo run --bin qos_core \
--features mock \
Expand Down
4 changes: 2 additions & 2 deletions src/qos_core/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ impl Parser {
self
}

/// Wether or not the user passed in `--help`. Should always be checked.
/// Whether or not the user passed in `--help`. Should always be checked.
#[must_use]
pub fn help(&self) -> bool {
self.token_map.get_flag(HELP).unwrap_or(false)
}

/// Wether or not the user passed in `--version`. Should always be checked.
/// Whether or not the user passed in `--version`. Should always be checked.
#[must_use]
pub fn version(&self) -> bool {
self.token_map.get_flag(VERSION).unwrap_or(false)
Expand Down
2 changes: 1 addition & 1 deletion src/qos_host/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl GetParserForOptions for HostParser {
.takes_value(true)
)
.token(
Token::new(VSOCK_TO_HOST, "wether to add the to-host svm flag to the enclave vsock connection. Valid options are `true` or `false`")
Token::new(VSOCK_TO_HOST, "whether to add the to-host svm flag to the enclave vsock connection. Valid options are `true` or `false`")
.takes_value(true)
.required(false)
.forbids(vec![USOCK])
Expand Down
2 changes: 1 addition & 1 deletion src/qos_test_primitives/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub fn wait_until_port_is_bound(port: u16) {
)
}

/// Return wether or not the port can be bind-ed too.
/// Return whether or not the port can be bind-ed too.
fn port_is_available(port: u16) -> bool {
TcpListener::bind(("127.0.0.1", port)).is_ok()
}

0 comments on commit ea94d09

Please sign in to comment.