Merge branch 'main' into peer-set-2

Cuprate · Nov 3, 2024 · 9ddf88d · 9ddf88d
2 parents 59e346a + 372cab2
commit 9ddf88d
Show file tree

Hide file tree

Showing 65 changed files with 1,302 additions and 373 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -133,7 +133,12 @@ jobs:
     - name: Test
       run: |
         cargo test --all-features --workspace
-        cargo test --package cuprate-blockchain --no-default-features --features redb --features service
+        cargo test --package cuprate-blockchain --no-default-features --features redb
+
+    - name: Hack Check
+      run: |
+        cargo install cargo-hack --locked
+        cargo hack --workspace check --feature-powerset --no-dev-deps
 
     # TODO: upload binaries with `actions/upload-artifact@v3`
     - name: Build

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -120,12 +120,15 @@ Before pushing your code, please run the following at the root of the repository
 
 After that, ensure all other CI passes by running:
 
-| Command                                                                | Does what |
-|------------------------------------------------------------------------|-----------|
-| `RUSTDOCFLAGS='-D warnings' cargo doc --workspace --all-features`      | Checks documentation is OK
-| `cargo clippy --workspace --all-features --all-targets -- -D warnings` | Checks clippy lints are satisfied
-| `cargo test --all-features --workspace`                                | Runs all tests
-| `cargo build --all-features --all-targets --workspace`                 | Builds all code
+| Command                                                                | Does what                                                               |
+|------------------------------------------------------------------------|-------------------------------------------------------------------------|
+| `RUSTDOCFLAGS='-D warnings' cargo doc --workspace --all-features`      | Checks documentation is OK                                              |
+| `cargo clippy --workspace --all-features --all-targets -- -D warnings` | Checks clippy lints are satisfied                                       |
+| `cargo test --all-features --workspace`                                | Runs all tests                                                          |
+| `cargo build --all-features --all-targets --workspace`                 | Builds all code                                                         |
+| `cargo hack --workspace check --feature-powerset --no-dev-deps`        | Uses `cargo hack` to check our crates build with different features set |
+
+`cargo hack` can be installed with `cargo` from: https://github.com/taiki-e/cargo-hack.
 
 **Note: in order for some tests to work, you will need to place a [`monerod`](https://www.getmonero.org/downloads/) binary at the root of the repository.**
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/binaries/cuprated/Cargo.toml b/binaries/cuprated/Cargo.toml
@@ -9,31 +9,32 @@ repository = "https://github.com/Cuprate/cuprate/tree/main/binaries/cuprated"
 
 [dependencies]
 # TODO: after v1.0.0, remove unneeded dependencies.
-cuprate-consensus        = { workspace = true }
-cuprate-fast-sync        = { workspace = true }
+cuprate-consensus         = { workspace = true }
+cuprate-fast-sync         = { workspace = true }
 cuprate-consensus-context = { workspace = true }
-cuprate-consensus-rules  = { workspace = true }
-cuprate-cryptonight      = { workspace = true }
-cuprate-helper           = { workspace = true }
-cuprate-epee-encoding    = { workspace = true }
-cuprate-fixed-bytes      = { workspace = true }
-cuprate-levin            = { workspace = true }
-cuprate-wire             = { workspace = true }
-cuprate-p2p              = { workspace = true }
-cuprate-p2p-core         = { workspace = true }
-cuprate-dandelion-tower  = { workspace = true, features = ["txpool"] }
-cuprate-async-buffer     = { workspace = true }
-cuprate-address-book     = { workspace = true }
-cuprate-blockchain       = { workspace = true, features = ["service"] }
-cuprate-database-service = { workspace = true }
-cuprate-txpool           = { workspace = true }
-cuprate-database         = { workspace = true }
-cuprate-pruning          = { workspace = true }
-cuprate-test-utils       = { workspace = true }
-cuprate-types            = { workspace = true }
-cuprate-json-rpc         = { workspace = true }
-cuprate-rpc-interface    = { workspace = true }
-cuprate-rpc-types        = { workspace = true }
+cuprate-consensus-rules   = { workspace = true }
+cuprate-constants         = { workspace = true }
+cuprate-cryptonight       = { workspace = true }
+cuprate-helper            = { workspace = true }
+cuprate-epee-encoding     = { workspace = true }
+cuprate-fixed-bytes       = { workspace = true }
+cuprate-levin             = { workspace = true }
+cuprate-wire              = { workspace = true }
+cuprate-p2p               = { workspace = true }
+cuprate-p2p-core          = { workspace = true }
+cuprate-dandelion-tower   = { workspace = true, features = ["txpool"] }
+cuprate-async-buffer      = { workspace = true }
+cuprate-address-book      = { workspace = true }
+cuprate-blockchain        = { workspace = true }
+cuprate-database-service  = { workspace = true }
+cuprate-txpool            = { workspace = true }
+cuprate-database          = { workspace = true }
+cuprate-pruning           = { workspace = true }
+cuprate-test-utils        = { workspace = true }
+cuprate-types             = { workspace = true }
+cuprate-json-rpc          = { workspace = true }
+cuprate-rpc-interface     = { workspace = true }
+cuprate-rpc-types         = { workspace = true }
 
 # TODO: after v1.0.0, remove unneeded dependencies.
 anyhow                = { workspace = true }

diff --git a/binaries/cuprated/src/main.rs b/binaries/cuprated/src/main.rs
@@ -9,6 +9,10 @@
     unused_variables,
     clippy::needless_pass_by_value,
     clippy::unused_async,
+    clippy::diverging_sub_expression,
+    unused_mut,
+    clippy::let_unit_value,
+    clippy::needless_pass_by_ref_mut,
     reason = "TODO: remove after v1.0.0"
 )]
 

diff --git a/binaries/cuprated/src/rpc.rs b/binaries/cuprated/src/rpc.rs
@@ -3,6 +3,7 @@
 //! Will contain the code to initiate the RPC and a request handler.
 
 mod bin;
+mod constants;
 mod handler;
 mod json;
 mod other;

diff --git a/binaries/cuprated/src/rpc/constants.rs b/binaries/cuprated/src/rpc/constants.rs
@@ -0,0 +1,5 @@
+//! Constants used within RPC.
+
+/// The string message used in RPC response fields for when
+/// `cuprated` does not support a field that `monerod` has.
+pub(super) const FIELD_NOT_SUPPORTED: &str = "`cuprated` does not support this field.";