From 2f2b3b8a19a64e3bfee3947075923d41ec331041 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 11 May 2021 10:30:13 +1000 Subject: [PATCH] Update metadata and remove outdated config files / READMEs --- monero-harness/Cargo.toml | 1 + monero-harness/README.md | 10 ---------- monero-harness/rust-toolchain | 1 - monero-harness/rustfmt.toml | 9 --------- monero-harness/src/image.rs | 6 ++---- monero-harness/src/lib.rs | 11 +++++------ monero-rpc/README.md | 10 ---------- monero-rpc/rust-toolchain | 1 - monero-rpc/rustfmt.toml | 9 --------- monero-rpc/src/monerod.rs | 17 ++++++++++++----- monero-rpc/src/wallet.rs | 3 ++- 11 files changed, 22 insertions(+), 56 deletions(-) delete mode 100644 monero-harness/README.md delete mode 100644 monero-harness/rust-toolchain delete mode 100644 monero-harness/rustfmt.toml delete mode 100644 monero-rpc/README.md delete mode 100644 monero-rpc/rust-toolchain delete mode 100644 monero-rpc/rustfmt.toml diff --git a/monero-harness/Cargo.toml b/monero-harness/Cargo.toml index 2a494567..b30066c8 100644 --- a/monero-harness/Cargo.toml +++ b/monero-harness/Cargo.toml @@ -3,6 +3,7 @@ name = "monero-harness" version = "0.1.0" authors = [ "CoBloX Team " ] edition = "2018" +publish = false [dependencies] anyhow = "1" diff --git a/monero-harness/README.md b/monero-harness/README.md deleted file mode 100644 index c8b46c5c..00000000 --- a/monero-harness/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Monero Harness - -Provides an implementation of `testcontainers::Image` for a monero image to run -`monerod` and `monero-wallet-rpc` in a docker container. - -Also provides two standalone JSON RPC clients, one each for `monerod` and `monero-wallet-rpc`. - -## Example Usage - -Please see `tests/*` for example usage. diff --git a/monero-harness/rust-toolchain b/monero-harness/rust-toolchain deleted file mode 100644 index 0a3db35b..00000000 --- a/monero-harness/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.46.0 diff --git a/monero-harness/rustfmt.toml b/monero-harness/rustfmt.toml deleted file mode 100644 index d973e35c..00000000 --- a/monero-harness/rustfmt.toml +++ /dev/null @@ -1,9 +0,0 @@ -edition = "2018" -condense_wildcard_suffixes = true -format_macro_matchers = true -imports_granularity = "Crate" -use_field_init_shorthand = true -format_code_in_doc_comments = true -normalize_comments = true -wrap_comments = true -overflow_delimited_expr = true diff --git a/monero-harness/src/image.rs b/monero-harness/src/image.rs index 8f7f8e41..f7cc21ed 100644 --- a/monero-harness/src/image.rs +++ b/monero-harness/src/image.rs @@ -1,8 +1,6 @@ use std::collections::HashMap; -use testcontainers::{ - core::{Container, Docker, WaitForMessage}, - Image, -}; +use testcontainers::core::{Container, Docker, WaitForMessage}; +use testcontainers::Image; pub const MONEROD_DAEMON_CONTAINER_NAME: &str = "monerod"; pub const MONEROD_DEFAULT_NETWORK: &str = "monero_network"; diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs index 3c7214af..0e3b2127 100644 --- a/monero-harness/src/lib.rs +++ b/monero-harness/src/lib.rs @@ -24,13 +24,12 @@ pub mod image; use crate::image::{MONEROD_DAEMON_CONTAINER_NAME, MONEROD_DEFAULT_NETWORK, RPC_PORT}; use anyhow::{anyhow, bail, Context, Result}; -use monero_rpc::{ - monerod, - monerod::MonerodRpc as _, - wallet::{self, GetAddress, MoneroWalletRpc as _, Refreshed, Transfer}, -}; +use monero_rpc::monerod; +use monero_rpc::monerod::MonerodRpc as _; +use monero_rpc::wallet::{self, GetAddress, MoneroWalletRpc as _, Refreshed, Transfer}; use std::time::Duration; -use testcontainers::{clients::Cli, Container, Docker, RunArgs}; +use testcontainers::clients::Cli; +use testcontainers::{Container, Docker, RunArgs}; use tokio::time; /// How often we mine a block. diff --git a/monero-rpc/README.md b/monero-rpc/README.md deleted file mode 100644 index c8b46c5c..00000000 --- a/monero-rpc/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Monero Harness - -Provides an implementation of `testcontainers::Image` for a monero image to run -`monerod` and `monero-wallet-rpc` in a docker container. - -Also provides two standalone JSON RPC clients, one each for `monerod` and `monero-wallet-rpc`. - -## Example Usage - -Please see `tests/*` for example usage. diff --git a/monero-rpc/rust-toolchain b/monero-rpc/rust-toolchain deleted file mode 100644 index 0a3db35b..00000000 --- a/monero-rpc/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.46.0 diff --git a/monero-rpc/rustfmt.toml b/monero-rpc/rustfmt.toml deleted file mode 100644 index d973e35c..00000000 --- a/monero-rpc/rustfmt.toml +++ /dev/null @@ -1,9 +0,0 @@ -edition = "2018" -condense_wildcard_suffixes = true -format_macro_matchers = true -imports_granularity = "Crate" -use_field_init_shorthand = true -format_code_in_doc_comments = true -normalize_comments = true -wrap_comments = true -overflow_delimited_expr = true diff --git a/monero-rpc/src/monerod.rs b/monero-rpc/src/monerod.rs index bf917a1a..32e79cec 100644 --- a/monero-rpc/src/monerod.rs +++ b/monero-rpc/src/monerod.rs @@ -1,6 +1,9 @@ use anyhow::{Context, Result}; -use monero::{cryptonote::hash::Hash, util::ringct, PublicKey}; -use serde::{de::DeserializeOwned, Deserialize, Serialize, Serializer}; +use monero::cryptonote::hash::Hash; +use monero::util::ringct; +use monero::PublicKey; +use serde::de::DeserializeOwned; +use serde::{Deserialize, Serialize, Serializer}; #[jsonrpc_client::api(version = "2.0")] pub trait MonerodRpc { @@ -181,7 +184,8 @@ pub enum Status { mod monero_serde_hex_block { use super::*; use monero::consensus::Decodable; - use serde::{de::Error, Deserialize, Deserializer}; + use serde::de::Error; + use serde::{Deserialize, Deserializer}; use std::io::Cursor; pub fn deserialize<'de, D>(deserializer: D) -> Result @@ -201,8 +205,11 @@ mod monero_serde_hex_block { mod byte_array { use super::*; - use serde::{de::Error, Deserializer}; - use std::{convert::TryFrom, fmt, marker::PhantomData}; + use serde::de::Error; + use serde::Deserializer; + use std::convert::TryFrom; + use std::fmt; + use std::marker::PhantomData; pub fn serialize(bytes: B, serializer: S) -> Result where diff --git a/monero-rpc/src/wallet.rs b/monero-rpc/src/wallet.rs index 4f10f6ab..db4e318d 100644 --- a/monero-rpc/src/wallet.rs +++ b/monero-rpc/src/wallet.rs @@ -1,5 +1,6 @@ use anyhow::{Context, Result}; -use serde::{de::Error, Deserialize, Deserializer, Serialize}; +use serde::de::Error; +use serde::{Deserialize, Deserializer, Serialize}; #[jsonrpc_client::api(version = "2.0")] pub trait MoneroWalletRpc {