diff --git a/Cargo.lock b/Cargo.lock index bf21f22..7799a90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,6 +542,17 @@ dependencies = [ name = "cuprate-rpc-interface" version = "0.0.0" +[[package]] +name = "cuprate-rpc-types" +version = "0.0.0" +dependencies = [ + "monero-serai", + "paste", + "serde", + "serde_json", + "strum", +] + [[package]] name = "cuprate-test-utils" version = "0.1.0" @@ -1554,17 +1565,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "monero-rpc-types" -version = "0.0.0" -dependencies = [ - "monero-serai", - "paste", - "serde", - "serde_json", - "strum", -] - [[package]] name = "monero-serai" version = "0.1.4-alpha" diff --git a/Cargo.toml b/Cargo.toml index bde9606..fab1687 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,12 +19,11 @@ members = [ "storage/cuprate-txpool", "storage/database", "pruning", - "rpc/monero-rpc-types", "test-utils", "types", "rpc/json-rpc", - "rpc/monero-rpc-types", - "rpc/cuprate-rpc-interface", + "rpc/types", + "rpc/interface", ] [profile.release] diff --git a/rpc/cuprate-rpc-interface/Cargo.toml b/rpc/interface/Cargo.toml similarity index 100% rename from rpc/cuprate-rpc-interface/Cargo.toml rename to rpc/interface/Cargo.toml diff --git a/rpc/cuprate-rpc-interface/src/lib.rs b/rpc/interface/src/lib.rs similarity index 100% rename from rpc/cuprate-rpc-interface/src/lib.rs rename to rpc/interface/src/lib.rs diff --git a/rpc/monero-rpc-types/Cargo.toml b/rpc/types/Cargo.toml similarity index 81% rename from rpc/monero-rpc-types/Cargo.toml rename to rpc/types/Cargo.toml index ca7c827..d38627b 100644 --- a/rpc/monero-rpc-types/Cargo.toml +++ b/rpc/types/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "monero-rpc-types" +name = "cuprate-rpc-types" version = "0.0.0" edition = "2021" description = "Monero RPC types" license = "MIT" authors = ["hinto-janai"] -repository = "https://github.com/Cuprate/cuprate/tree/main/rpc/monero-rpc-types" -keywords = ["monero", "rpc", "types"] +repository = "https://github.com/Cuprate/cuprate/tree/main/rpc/cuprate-rpc-types" +keywords = ["cuprate", "rpc", "types", "monero"] [features] default = [] diff --git a/rpc/monero-rpc-types/README.md b/rpc/types/README.md similarity index 98% rename from rpc/monero-rpc-types/README.md rename to rpc/types/README.md index 9b37895..297eabd 100644 --- a/rpc/monero-rpc-types/README.md +++ b/rpc/types/README.md @@ -11,7 +11,7 @@ This crate ports the types used in Monero's RPC interface, including: This crate's types are split in the following manner: 1. This crate has 3 modules: - - The root module (`monero_rpc_types`) + - The root module (`cuprate_rpc_types`) - [`req`] (request types) - [`resp`] (response types) 1. Miscellaneous types are found in the root module, e.g. [`Status`] diff --git a/rpc/monero-rpc-types/src/bin.rs b/rpc/types/src/bin.rs similarity index 100% rename from rpc/monero-rpc-types/src/bin.rs rename to rpc/types/src/bin.rs diff --git a/rpc/monero-rpc-types/src/data.rs b/rpc/types/src/data.rs similarity index 100% rename from rpc/monero-rpc-types/src/data.rs rename to rpc/types/src/data.rs diff --git a/rpc/monero-rpc-types/src/json.rs b/rpc/types/src/json.rs similarity index 100% rename from rpc/monero-rpc-types/src/json.rs rename to rpc/types/src/json.rs diff --git a/rpc/monero-rpc-types/src/lib.rs b/rpc/types/src/lib.rs similarity index 100% rename from rpc/monero-rpc-types/src/lib.rs rename to rpc/types/src/lib.rs diff --git a/rpc/monero-rpc-types/src/macros.rs b/rpc/types/src/macros.rs similarity index 100% rename from rpc/monero-rpc-types/src/macros.rs rename to rpc/types/src/macros.rs diff --git a/rpc/monero-rpc-types/src/other.rs b/rpc/types/src/other.rs similarity index 100% rename from rpc/monero-rpc-types/src/other.rs rename to rpc/types/src/other.rs diff --git a/rpc/monero-rpc-types/src/status.rs b/rpc/types/src/status.rs similarity index 99% rename from rpc/monero-rpc-types/src/status.rs rename to rpc/types/src/status.rs index b822172..ea1a0b8 100644 --- a/rpc/monero-rpc-types/src/status.rs +++ b/rpc/types/src/status.rs @@ -18,7 +18,7 @@ use strum::{ /// /// ## Serialization and string formatting /// ```rust -/// # use monero_rpc_types::*; +/// # use cuprate_rpc_types::*; /// use serde_json::to_string; /// use strum::AsRefStr; ///