Update metadata and remove outdated config files / READMEs

monero-harness/Cargo.toml

@@ -3,6 +3,7 @@ name = "monero-harness"
 version = "0.1.0"
 authors = [ "CoBloX Team <team@coblox.tech>" ]
 edition = "2018"
+publish = false
 
 [dependencies]
 anyhow = "1"

monero-harness/README.md

@@ -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.

monero-harness/rust-toolchain

@@ -1 +0,0 @@
-1.46.0

monero-harness/rustfmt.toml

@@ -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

monero-harness/src/image.rs

@@ -1,8 +1,6 @@
 use std::collections::HashMap;
-use testcontainers::{
+use testcontainers::core::{Container, Docker, WaitForMessage};
-    core::{Container, Docker, WaitForMessage},
+use testcontainers::Image;
-    Image,
-};
 
 pub const MONEROD_DAEMON_CONTAINER_NAME: &str = "monerod";
 pub const MONEROD_DEFAULT_NETWORK: &str = "monero_network";

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::{
+use monero_rpc::monerod;
-    monerod,
+use monero_rpc::monerod::MonerodRpc as _;
-    monerod::MonerodRpc as _,
+use monero_rpc::wallet::{self, GetAddress, MoneroWalletRpc as _, Refreshed, Transfer};
-    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.

monero-rpc/README.md

@@ -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.

monero-rpc/rust-toolchain

@@ -1 +0,0 @@
-1.46.0

monero-rpc/rustfmt.toml

@@ -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

monero-rpc/src/monerod.rs

@@ -1,6 +1,9 @@
 use anyhow::{Context, Result};
-use monero::{cryptonote::hash::Hash, util::ringct, PublicKey};
+use monero::cryptonote::hash::Hash;
-use serde::{de::DeserializeOwned, Deserialize, Serialize, Serializer};
+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<monero::Block, D::Error>
@@ -201,8 +205,11 @@ mod monero_serde_hex_block {
 
 mod byte_array {
     use super::*;
-    use serde::{de::Error, Deserializer};
+    use serde::de::Error;
-    use std::{convert::TryFrom, fmt, marker::PhantomData};
+    use serde::Deserializer;
+    use std::convert::TryFrom;
+    use std::fmt;
+    use std::marker::PhantomData;
 
     pub fn serialize<S, B>(bytes: B, serializer: S) -> Result<S::Ok, S::Error>
     where

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 {