fix hack + enable it for cuprate-database

Author: Boog900

.github/workflows/hack.yml

@@ -32,4 +32,4 @@ jobs:
 
       - name: Hack Check
         # TODO: remove the exclude when `cuprate-database` errors are fixed
-        run: cargo hack --workspace --exclude cuprate-database check --feature-powerset --no-dev-deps
+        run: cargo hack --workspace check --feature-powerset --no-dev-deps

Cargo.lock

@@ -9,7 +9,7 @@ name = "cuprate-fast-sync-create-hashes"
 path = "src/create.rs"
 
 [dependencies]
-cuprate-blockchain          = { workspace = true }
+cuprate-blockchain          = { workspace = true, features = ["service"] }
 cuprate-consensus           = { workspace = true }
 cuprate-consensus-rules     = { workspace = true }
 cuprate-consensus-context   = { workspace = true }

consensus/fast-sync/Cargo.toml

@@ -17,7 +17,7 @@ asynch    = ["dep:futures", "dep:rayon"]
 cast      = []
 constants = []
 crypto    = ["dep:curve25519-dalek", "dep:monero-serai", "std"]
-fs        = ["dep:dirs"]
+fs        = ["dep:dirs", "std"]
 num       = []
 map       = ["cast", "dep:monero-serai", "dep:cuprate-constants"]
 time      = ["dep:chrono", "std"]

helper/Cargo.toml

@@ -1,3 +1,5 @@
+use alloc::{string::ToString, vec, vec::Vec};
+
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use ref_cast::RefCast;
 

net/epee-encoding/src/container_as_blob.rs

@@ -64,6 +64,7 @@ use hex as _;
 
 extern crate alloc;
 
+use alloc::string::ToString;
 use core::str::from_utf8 as str_from_utf8;
 
 use bytes::{Buf, BufMut, Bytes, BytesMut};

net/epee-encoding/src/lib.rs

@@ -9,7 +9,7 @@ authors = ["Boog900"]
 [dependencies]
 cuprate-constants   = { workspace = true }
 cuprate-pruning     = { workspace = true }
-cuprate-p2p-core    = { workspace = true }
+cuprate-p2p-core    = { workspace = true, features = ["borsh"] }
 
 tower = { workspace = true, features = ["util"] }
 tokio = { workspace = true, features = ["time", "fs", "rt"]}

p2p/address-book/Cargo.toml

@@ -10,7 +10,7 @@ default = []
 borsh = ["dep:borsh"]
 
 [dependencies]
-cuprate-constants = { workspace = true }
+cuprate-constants = { workspace = true, features = ["block"] }
 
 thiserror = { workspace = true }
 

pruning/Cargo.toml

@@ -10,20 +10,20 @@ keywords    = ["cuprate", "rpc", "interface"]
 
 [features]
 default  = ["dummy", "serde"]
-dummy    = []
+dummy    = ["dep:cuprate-helper", "dep:futures"]
 
 [dependencies]
 cuprate-epee-encoding = { workspace = true, default-features = false }
 cuprate-json-rpc      = { workspace = true, default-features = false }
 cuprate-rpc-types     = { workspace = true, features = ["serde", "epee"], default-features = false }
-cuprate-helper        = { workspace = true, features = ["asynch"], default-features = false }
+cuprate-helper        = { workspace = true, features = ["asynch"], default-features = false, optional = true }
 
 anyhow     = { workspace = true }
 axum       = { version = "0.7.5", features = ["json"], default-features = false }
 serde      = { workspace = true, optional = true }
-tower      = { workspace = true }
+tower      = { workspace = true, features = ["util"] }
 paste      = { workspace = true }
-futures    = { workspace = true }
+futures    = { workspace = true, optional = true }
 
 [dev-dependencies]
 cuprate-test-utils = { workspace = true }

rpc/interface/Cargo.toml

@@ -20,12 +20,14 @@ use cuprate_types::BlockCompleteEntry;
 
 use crate::{
     base::AccessResponseBase,
-    defaults::{default_false, default_zero},
     macros::{define_request, define_request_and_response, define_request_and_response_doc},
-    misc::{BlockOutputIndices, GetOutputsOut, OutKeyBin, PoolInfoExtent, PoolTxInfo, Status},
+    misc::{BlockOutputIndices, GetOutputsOut, OutKeyBin, PoolTxInfo, Status},
     rpc_call::RpcCallValue,
 };
 
+#[cfg(any(feature = "epee", feature = "serde"))]
+use crate::defaults::{default_false, default_zero};
+
 //---------------------------------------------------------------------------------------------------- Definitions
 define_request_and_response! {
     get_blocks_by_heightbin,
@@ -137,15 +139,15 @@ define_request! {
     core_rpc_server_commands_defs, h, 162, 262,
 )]
 ///
-/// This response's variant depends upon [`PoolInfoExtent`].
+/// This response's variant depends upon [`crate::misc::PoolInfoExtent`].
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum GetBlocksResponse {
-    /// Will always serialize a [`PoolInfoExtent::None`] field.
+    /// Will always serialize a [`crate::misc::PoolInfoExtent::None`] field.
     PoolInfoNone(GetBlocksResponsePoolInfoNone),
-    /// Will always serialize a [`PoolInfoExtent::Incremental`] field.
+    /// Will always serialize a [`crate::misc::PoolInfoExtent::Incremental`] field.
     PoolInfoIncremental(GetBlocksResponsePoolInfoIncremental),
-    /// Will always serialize a [`PoolInfoExtent::Full`] field.
+    /// Will always serialize a [`crate::misc::PoolInfoExtent::Full`] field.
     PoolInfoFull(GetBlocksResponsePoolInfoFull),
 }
 
@@ -254,7 +256,7 @@ pub struct __GetBlocksResponseEpeeBuilder {
     pub current_height: Option<u64>,
     pub output_indices: Option<Vec<BlockOutputIndices>>,
     pub daemon_time: Option<u64>,
-    pub pool_info_extent: Option<PoolInfoExtent>,
+    pub pool_info_extent: Option<crate::misc::PoolInfoExtent>,
     pub added_pool_txs: Option<Vec<PoolTxInfo>>,
     pub remaining_added_pool_txids: Option<ByteArrayVec<32>>,
     pub removed_pool_txids: Option<ByteArrayVec<32>>,
@@ -304,7 +306,7 @@ impl EpeeObjectBuilder<GetBlocksResponse> for __GetBlocksResponseEpeeBuilder {
         let pool_info_extent = self.pool_info_extent.ok_or(ELSE)?;
 
         let this = match pool_info_extent {
-            PoolInfoExtent::None => {
+            crate::misc::PoolInfoExtent::None => {
                 GetBlocksResponse::PoolInfoNone(GetBlocksResponsePoolInfoNone {
                     status,
                     untrusted,
@@ -315,7 +317,7 @@ impl EpeeObjectBuilder<GetBlocksResponse> for __GetBlocksResponseEpeeBuilder {
                     daemon_time,
                 })
             }
-            PoolInfoExtent::Incremental => {
+            crate::misc::PoolInfoExtent::Incremental => {
                 GetBlocksResponse::PoolInfoIncremental(GetBlocksResponsePoolInfoIncremental {
                     status,
                     untrusted,
@@ -329,7 +331,7 @@ impl EpeeObjectBuilder<GetBlocksResponse> for __GetBlocksResponseEpeeBuilder {
                     removed_pool_txids: self.removed_pool_txids.ok_or(ELSE)?,
                 })
             }
-            PoolInfoExtent::Full => {
+            crate::misc::PoolInfoExtent::Full => {
                 GetBlocksResponse::PoolInfoFull(GetBlocksResponsePoolInfoFull {
                     status,
                     untrusted,
@@ -353,7 +355,7 @@ impl EpeeObject for GetBlocksResponse {
     type Builder = __GetBlocksResponseEpeeBuilder;
 
     fn number_of_fields(&self) -> u64 {
-        // [`PoolInfoExtent`] + inner struct fields.
+        // [`crate::misc::PoolInfoExtent`] + inner struct fields.
         let inner_fields = match self {
             Self::PoolInfoNone(s) => s.number_of_fields(),
             Self::PoolInfoIncremental(s) => s.number_of_fields(),
@@ -367,15 +369,27 @@ impl EpeeObject for GetBlocksResponse {
         match self {
             Self::PoolInfoNone(s) => {
                 s.write_fields(w)?;
-                write_field(PoolInfoExtent::None.to_u8(), "pool_info_extent", w)?;
+                write_field(
+                    crate::misc::PoolInfoExtent::None.to_u8(),
+                    "pool_info_extent",
+                    w,
+                )?;
             }
             Self::PoolInfoIncremental(s) => {
                 s.write_fields(w)?;
-                write_field(PoolInfoExtent::Incremental.to_u8(), "pool_info_extent", w)?;
+                write_field(
+                    crate::misc::PoolInfoExtent::Incremental.to_u8(),
+                    "pool_info_extent",
+                    w,
+                )?;
             }
             Self::PoolInfoFull(s) => {
                 s.write_fields(w)?;
-                write_field(PoolInfoExtent::Full.to_u8(), "pool_info_extent", w)?;
+                write_field(
+                    crate::misc::PoolInfoExtent::Full.to_u8(),
+                    "pool_info_extent",
+                    w,
+                )?;
             }
         }