refactor: prune dependencies (#627)

* refactor: prune dependencies * refactor: replace tokio-tungstenite dep with crates.io version
interledger · Feb 7, 2020 · 14ad532 · 14ad532
1 parent 2e42258
commit 14ad532
Show file tree

Hide file tree

Showing 23 changed files with 225 additions and 561 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ilp-cli/Cargo.toml b/crates/ilp-cli/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
 clap = { version = "2.33.0", default-features = false }
-thiserror = { version = "1.0.4", default-features = false }
+thiserror = { version = "1.0.10", default-features = false }
 http = { version = "0.2", default-features = false }
 reqwest = { version = "0.10.1", default-features = false, features = ["default-tls", "blocking", "json"] }
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }

diff --git a/crates/ilp-node/Cargo.toml b/crates/ilp-node/Cargo.toml
@@ -32,19 +32,22 @@ required-features = ["redis"]
 
 
 [dependencies]
+interledger = { path = "../interledger", version = "^0.6.0", default-features = false, features = ["node"] }
+
 bytes = { version = "0.4.12", default-features = false }
 bytes05 = { package = "bytes", version = "0.5", default-features = false }
+cfg-if = { version = "0.1.10", default-features = false }
 clap = { version = "2.33.0", default-features = false }
 config = { version = "0.10.1", default-features = false, features = ["json", "toml", "yaml"] }
 futures = { version = "0.3.1", default-features = false, features = ["compat"] }
 hex = { version = "0.4.0", default-features = false }
-interledger = { path = "../interledger", version = "^0.6.0", default-features = false, features = ["node"] }
-once_cell = "1.3.1"
+once_cell = { version = "1.3.1", default-features = false }
 num-bigint = { version = "0.2.3", default-features = false, features = ["std"] }
-redis_crate = { package = "redis", version = "0.15.1", optional = true, features = ["tokio-rt-core"] }
+redis_crate = { package = "redis", version = "0.15.1", optional = true, default-features = false, features = ["tokio-rt-core"] }
 ring = { version = "0.16.9", default-features = false }
 serde = { version = "1.0.101", default-features = false }
-tokio = { version = "0.2.8", features = ["rt-core", "macros", "time"] }
+tokio = { version = "0.2.8", default-features = false, features = ["rt-core", "macros", "time"] }
+tracing = { version = "0.1.12", default-features = false, features = ["log"] }
 url = { version = "2.1.1", default-features = false }
 libc = { version = "0.2.62", default-features = false }
 warp = { version = "0.2", default-features = false, features = ["websocket"] }
@@ -53,21 +56,18 @@ uuid = { version = "0.8.1", default-features = false}
 
 # For google-pubsub
 base64 = { version = "0.11.0", default-features = false, optional = true }
-chrono = { version = "0.4.9", default-features = false, features = [], optional = true}
+chrono = { version = "0.4.9", default-features = false, optional = true}
 parking_lot = { version = "0.10.0", default-features = false, optional = true }
 reqwest = { version = "0.10.0", default-features = false, features = ["default-tls", "json"], optional = true }
 serde_json = { version = "1.0.41", default-features = false, optional = true }
 yup-oauth2 = { version = "3.1.1", default-features = false, optional = true }
 
-
 # Tracing / metrics / prometheus for instrumentation
-tracing = { version = "0.1.12", default-features = true, features = ["log"] }
-tracing-futures = { version = "0.2", default-features = true, features = ["tokio", "futures-03"], optional = true }
-tracing-subscriber = { version = "0.2.0", default-features = true, features = ["tracing-log"], optional = true }
+tracing-futures = { version = "0.2", default-features = false, features = ["tokio", "futures-03"], optional = true }
+tracing-subscriber = { version = "0.2.0", default-features = false, features = ["tracing-log", "fmt", "env-filter", "chrono"], optional = true }
 metrics = { version = "0.12.0", default-features = false, features = ["std"], optional = true }
 metrics-core = { version = "0.5.1", default-features = false, optional = true }
 metrics-runtime = { version = "0.13.0", default-features = false, features = ["metrics-observer-prometheus"], optional = true }
-cfg-if = "0.1.10"
 
 [dev-dependencies]
 approx = { version = "0.3.2", default-features = false }

diff --git a/crates/interledger-api/Cargo.toml b/crates/interledger-api/Cargo.toml
@@ -8,10 +8,6 @@ edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
-bytes = { version = "0.5", default-features = false }
-futures = { version = "0.3.1", default-features = false }
-futures-retry = { version = "0.4", default-features = false }
-http = { version = "0.2", default-features = false }
 interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
 interledger-http = { path = "../interledger-http", version = "^0.4.0", default-features = false }
 interledger-ildcp = { path = "../interledger-ildcp", version = "^0.4.0", default-features = false }
@@ -23,21 +19,25 @@ interledger-spsp = { path = "../interledger-spsp", version = "^0.4.0", default-f
 interledger-stream = { path = "../interledger-stream", version = "^0.4.0", default-features = false }
 interledger-ccp = { path = "../interledger-ccp", version = "^0.3.0", default-features = false }
 interledger-btp = { path = "../interledger-btp", version = "^0.4.0", default-features = false }
+interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false, features = ["warp_errors"] }
+
+bytes = { version = "0.5", default-features = false }
+futures = { version = "0.3.1", default-features = false }
+futures-retry = { version = "0.4", default-features = false }
+http = { version = "0.2", default-features = false }
 log = { version = "0.4.8", default-features = false }
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.41", default-features = false }
-serde_path_to_error = { version = "0.1.2", default-features = false }
 reqwest = { version = "0.10", default-features = false, features = ["default-tls", "json"] }
 url = { version = "2.1.1", default-features = false, features = ["serde"] }
 uuid = { version = "0.8.1", default-features = false}
 warp = { version = "0.2", default-features = false }
 secrecy = { version = "0.6", default-features = false, features = ["serde"] }
 once_cell = "1.3.1"
 async-trait = "0.1.22"
-interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false, features = ["warp_errors"] }
 
 [dev-dependencies]
-tokio = { version = "0.2.9", features = ["rt-core", "macros"] }
+tokio = { version = "0.2.9", default-features = false, features = ["rt-core", "macros"] }
 
 [badges]
 circle-ci = { repository = "interledger-rs/interledger-rs" }

diff --git a/crates/interledger-btp/Cargo.toml b/crates/interledger-btp/Cargo.toml
@@ -8,33 +8,30 @@ edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
+interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false }
+interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
+interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
+
 bytes = { version = "0.4.12", default-features = false }
 byteorder = { version = "1.3.2", default-features = false }
 chrono = { version = "0.4.9", default-features = false }
 futures = { version = "0.3.1", default-features = false }
-interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false }
-interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
-interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
 log = { version = "0.4.8", default-features = false }
 num-bigint = { version = "0.2.3", default-features = false, features = ["std"] }
 parking_lot = { version = "0.10.0", default-features = false }
-quick-error = { version = "1.2.2", default-features = false }
+thiserror = { version = "1.0.10", default-features = false }
 rand = { version = "0.7.2", default-features = false, features = ["std"] }
 stream-cancel = { version = "0.5", default-features = false }
-tokio-tungstenite = { version = "0.10.1", package = "tokio-tungstenite", git = "https://github.com/snapview/tokio-tungstenite", default-features = false, features = ["tls", "connect"] }
-
+tokio-tungstenite = { version = "0.10.1", default-features = false, features = ["tls", "connect"] }
 tungstenite = { version = "0.10.1", default-features = false }
-# we must force url v2.1.0 because stripping the "btp+" prefix from a BTP URL
-# is an operation which panics
 url = { version = "2.1.1", default-features = false }
 uuid = { version = "0.8.1", default-features = false, features = ["v4"]}
 warp = { version = "0.2", default-features = false, features = ["websocket"] }
-secrecy = "0.6"
-async-trait = "0.1.22"
-tokio = { version = "0.2.8", features = ["rt-core", "time", "stream", "macros"] }
-once_cell = "1.3.1"
-pin-project = "0.4.6"
-thiserror = "1.0.10"
+secrecy = { version = "0.6", default-features = false, features = ["alloc"] }
+async-trait = { version = "0.1.22", default-features = false }
+tokio = { version = "0.2.8", default-features = false, features = ["rt-core", "time", "stream", "macros"] }
+once_cell = { version = "1.3.1", default-features = false }
+pin-project = { version = "0.4.6", default-features = false }
 
 [dev-dependencies]
 hex = { version = "0.4.0", default-features = false }

diff --git a/crates/interledger-btp/src/errors.rs b/crates/interledger-btp/src/errors.rs
@@ -1,44 +1,18 @@
 use chrono;
-use quick_error::quick_error;
 use std;
 use std::str::Utf8Error;
 use std::string::FromUtf8Error;
 
-quick_error! {
-    #[derive(Debug)]
-    pub enum ParseError {
-        Io(err: std::io::Error) {
-            from()
-            description(err.description())
-            cause(err)
-        }
-        Utf8(err: Utf8Error) {
-            from()
-            description(err.description())
-            cause(err)
-        }
-        FromUtf8(err: FromUtf8Error) {
-            from()
-            description(err.description())
-            cause(err)
-        }
-        Chrono(err: chrono::ParseError) {
-            from()
-            description(err.description())
-            cause(err)
-        }
-        WrongType(descr: String) {
-            description(descr)
-            display("Wrong Type {}", descr)
-        }
-        InvalidPacket(descr: String) {
-            description(descr)
-            display("Invalid Packet {}", descr)
-        }
-        Other(err: Box<dyn std::error::Error>) {
-            cause(&**err)
-            description(err.description())
-            display("Error {}", err.description())
-        }
-    }
+#[derive(Debug, thiserror::Error)]
+pub enum ParseError {
+    #[error("I/O Error: {0}")]
+    IoErr(#[from] std::io::Error),
+    #[error("UTF-8 Error: {0}")]
+    Utf8Err(#[from] Utf8Error),
+    #[error("UTF-8 Conversion Error: {0}")]
+    FromUtf8Err(#[from] FromUtf8Error),
+    #[error("Chrono Error: {0}")]
+    ChronoErr(#[from] chrono::ParseError),
+    #[error("Invalid Packet: {0}")]
+    InvalidPacket(String),
 }
diff --git a/crates/interledger-ccp/Cargo.toml b/crates/interledger-ccp/Cargo.toml
@@ -8,18 +8,19 @@ edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
+interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false }
+interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
+interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
+
 bytes = { version = "0.4.12", default-features = false }
 byteorder = { version = "1.3.2", default-features = false }
 futures = { version = "0.3", default-features = false }
 hex = { version = "0.4.0", default-features = false }
-interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false }
-interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
-interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
-once_cell = "1.3.1"
+once_cell = { version = "1.3.1", default-features = false }
 log = { version = "0.4.8", default-features = false }
 parking_lot = { version = "0.10.0", default-features = false }
 ring = { version = "0.16.9", default-features = false }
 uuid = { version = "0.8.1", default-features = false, features = ["v4"]}
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
-async-trait = "0.1.22"
-tokio = { version = "0.2.6", features = ["time", "rt-core", "macros"] }
+async-trait = { version = "0.1.22", default-features = false }
+tokio = { version = "0.2.6", default-features = false, features = ["time", "rt-core", "macros"] }
diff --git a/crates/interledger-ccp/src/packet.rs b/crates/interledger-ccp/src/packet.rs
@@ -448,7 +448,7 @@ mod route_control_request {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            "Invalid Packet Packet is not a CCP message. Destination: peer.route.controk"
+            "Invalid Packet: Packet is not a CCP message. Destination: peer.route.controk"
         );
     }
 
@@ -459,7 +459,7 @@ mod route_control_request {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            "Invalid Packet Wrong condition: 66687aadf862bd776c8fc18b8e9f8e21089714856ee233b3902a591d0d5f2925"
+            "Invalid Packet: Wrong condition: 66687aadf862bd776c8fc18b8e9f8e21089714856ee233b3902a591d0d5f2925"
         );
     }
 
@@ -470,7 +470,7 @@ mod route_control_request {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            "Invalid Packet Packet expired"
+            "Invalid Packet: Packet expired"
         );
     }
 }
@@ -520,7 +520,7 @@ mod route_update_request {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            "Invalid Packet Packet is not a CCP message. Destination: peer.route.updatd"
+            "Invalid Packet: Packet is not a CCP message. Destination: peer.route.updatd"
         );
     }
 
@@ -529,7 +529,7 @@ mod route_update_request {
         let prepare = Prepare::try_from(BytesMut::from(hex::decode("0c7e0000000000000000323031353036313630303031303030303066687aadf862bd776c8fd18b8e9f8e20089714856ee233b3902a591d0d5f292511706565722e726f7574652e7570646174653221e55f8eabcd4e979ab9bf0ff00a224c000000340000003400000034000075300d6578616d706c652e616c69636501000100").unwrap())).unwrap();
         let result = RouteUpdateRequest::try_from_without_expiry(&prepare);
         assert!(result.is_err());
-        assert_eq!(result.unwrap_err().to_string(), "Invalid Packet Wrong condition: 66687aadf862bd776c8fd18b8e9f8e20089714856ee233b3902a591d0d5f2925");
+        assert_eq!(result.unwrap_err().to_string(), "Invalid Packet: Wrong condition: 66687aadf862bd776c8fd18b8e9f8e20089714856ee233b3902a591d0d5f2925");
     }
 
     #[test]
@@ -539,7 +539,7 @@ mod route_update_request {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            "Invalid Packet Packet expired"
+            "Invalid Packet: Packet expired"
         );
     }
 

diff --git a/crates/interledger-errors/Cargo.toml b/crates/interledger-errors/Cargo.toml
@@ -7,19 +7,19 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-once_cell = "1.3.1"
-thiserror = "1.0.10"
+interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
+
+once_cell = { version = "1.3.1", default-features = false }
+thiserror = { version = "1.0.10", default-features = false }
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.41" }
+serde_json = { version = "1.0.41", default-features = false }
 serde_path_to_error = { version = "0.1", default-features = false }
 http = { version = "0.2.0", default-features = false }
-chrono = { version = "0.4.9", features = ["clock"], default-features = false }
+chrono = { version = "0.4.9", default-features = false, features = ["clock"] }
 regex = { version ="1.3.1", default-features = false, features = ["std"] }
-interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
-
-warp = { version = "0.2.1" }
-redis = { version = "0.15.1", optional = true }
-url = "2.1.1"
+warp = { version = "0.2.1", default-features = false }
+redis = { version = "0.15.1", default-features = false, optional = true }
+url = { version = "2.1.1", default-features = false }
 
 [features]
 warp_errors = []

diff --git a/crates/interledger-http/Cargo.toml b/crates/interledger-http/Cargo.toml
@@ -8,11 +8,12 @@ edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
-bytes = { version = "0.5", default-features = false }
-futures = { version = "0.3", default-features = false }
 interledger-errors = { path = "../interledger-errors", version = "^0.1.0", default-features = false }
 interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
 interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
+
+bytes = { version = "0.5", default-features = false }
+futures = { version = "0.3", default-features = false }
 log = { version = "0.4.8", default-features = false }
 reqwest = { version = "0.10.0", default-features = false, features = ["default-tls"] }
 url = { version = "2.1.1", default-features = false }
@@ -21,13 +22,11 @@ serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.41", default-features = false }
 serde_path_to_error = { version = "0.1", default-features = false }
 http = { version = "0.2.0", default-features = false }
-chrono = { version = "0.4.9", features = ["clock"], default-features = false }
-regex = { version ="1.3.1", default-features = false, features = ["std"] }
-once_cell = "1.3.1"
+once_cell = { version = "1.3.1", default-features = false }
 mime = { version ="0.3.14", default-features = false }
-secrecy = "0.6"
-async-trait = "0.1.22"
+secrecy = { version = "0.6", default-features = false }
+async-trait = { version = "0.1.22", default-features = false }
 
 [dev-dependencies]
-uuid = { version = "0.8.1", features=["v4"]}
-tokio = { version = "0.2.6", features = ["rt-core", "macros"]}
+uuid = { version = "0.8.1", default-features = false, features=["v4"]}
+tokio = { version = "0.2.6", default-features = false, features = ["rt-core", "macros"]}
diff --git a/crates/interledger-ildcp/Cargo.toml b/crates/interledger-ildcp/Cargo.toml
@@ -8,15 +8,16 @@ edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [dependencies]
+interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
+interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
+
 bytes = { version = "0.4.12", default-features = false }
 byteorder = { version = "1.3.2", default-features = false }
 futures = { version = "0.3", default-features = false }
-interledger-packet = { path = "../interledger-packet", version = "^0.4.0", default-features = false }
-interledger-service = { path = "../interledger-service", version = "^0.4.0", default-features = false }
-once_cell = "1.3.1"
+once_cell = { version = "1.3.1", default-features = false }
 log = { version = "0.4.8", default-features = false }
-async-trait = "0.1.22"
+async-trait = { version = "0.1.22", default-features = false }
 
 [dev-dependencies]
-tokio = { version = "0.2.6", features = ["macros","rt-core"]}
-uuid = { version = "0.8.1", features = ["v4"] }
+tokio = { version = "0.2.6", default-features = false, features = ["macros","rt-core"]}
+uuid = { version = "0.8.1", default-features = false, features = ["v4"] }
diff --git a/crates/interledger-packet/Cargo.toml b/crates/interledger-packet/Cargo.toml
@@ -13,10 +13,10 @@ bytes05 = { package = "bytes", version = "0.5", default-features = false, featur
 bytes = { version = "0.4.12", default-features = false, features = ["serde"] }
 chrono = { version = "0.4.9", default-features = false, features = ["std"] }
 hex = { version = "0.4.0", default-features = false }
-quick-error = { version = "1.2.2", default-features = false }
+thiserror = { version = "1.0.10", default-features = false }
 serde = { version = "1.0.101", default-features = false, features = ["derive"], optional = true }
 regex = { version ="1.3.1", default-features = false, features = ["std"] }
-once_cell = "1.3.1"
+once_cell = { version = "1.3.1", default-features = false, features = ["std"] }
 
 [dev-dependencies]
 criterion = { version = "0.3.0", default-features = false }