-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: refactor server into server
crate
#146
Conversation
3969e32
to
d92af4c
Compare
After this, I'll:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're still working on structure, can we just move all tests into one big tests/integration.rs
? (and then we can either drop the isolated unit tests or move them to where they belong)
40bf5b1
to
7d5d6ea
Compare
2ce33b7
to
cb284b4
Compare
00812b7
to
89afbbc
Compare
89afbbc
to
83c70fb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think the commit message/PR title matches what this PR is now doing.
This is simply extracting the server implementation into its own crate. Please change the PR title and commit message to reflect that.
server
crate
83c70fb
to
df008c8
Compare
@rvolosatovs commit message and title reworded |
Signed-off-by: Richard Zak <[email protected]>
df008c8
to
f0a013f
Compare
Merged in 31ecb62 diff --git a/Cargo.toml b/Cargo.toml
index 062699c..ce07a86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,12 +10,12 @@ license = "AGPL-3.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-attestation = { path = "crates/attestation", features = ["sgx", "snp"] }
-steward-server = { path = "crates/server" }
anyhow = { version = "^1.0.66", default-features = false }
+attestation = { path = "crates/attestation", features = ["sgx", "snp"] }
axum = { version = "^0.5.17", features = ["headers"], default-features = false }
clap = { version = "^4.0.29", features = ["help", "usage", "error-context", "std", "derive", "env"], default-features = false }
confargs = { version = "^0.1.3", default-features = false }
+steward-server = { path = "crates/server" }
tokio = { version = "^1.23.0", features = ["rt", "macros"], default-features = false }
tower-http = { version = "^0.3.5", features = ["trace"], default-features = false }
tracing = { version = "^0.1.29", default-features = false }
diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
index 143c083..b892af0 100644
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -6,8 +6,8 @@ license = "AGPL-3.0"
description = "Server library for Steward"
[dependencies]
-attestation = { path = "../../crates/attestation", features = ["sgx", "snp"] }
anyhow = { version = "^1.0.66", default-features = false }
+attestation = { path = "../../crates/attestation", features = ["sgx", "snp"] }
axum = { version = "^0.5.17", features = ["headers"], default-features = false }
const-oid = { version = "0.9.1", features = ["db"], default-features = false }
der = { version = "0.6", features = ["std"], default-features = false }
@@ -30,5 +30,5 @@ http = { version = "^0.2.6", default-features = false }
memoffset = { version = "0.7.1", default-features = false }
rstest = { version = "0.16", default-features = false }
sgx = { version = "0.6.0", default-features = false }
-tower = { version = "^0.4.11", features = ["util"], default-features = false }
testaso = { version = "0.1", default-features = false }
+tower = { version = "^0.4.11", features = ["util"], default-features = false } |
Addresses #134, but doesn't close it, since this just reorganizes the test, but doesn't change them.
Inspired by Tokio's unit tests tokio-rs/tokio/tests.
Signed-off-by: Richard Zak [email protected]