From 94f052e4298a82d79a7e67d8600d44ab1ccbb38d Mon Sep 17 00:00:00 2001
From: Evan Feenstra <evanfeenstra@gmail.com>
Date: Thu, 9 Jun 2022 08:27:27 -0700
Subject: [PATCH] the std::Error is not needed

---
 broker/Cargo.toml | 4 ++--
 parser/Cargo.toml | 2 +-
 parser/src/lib.rs | 6 +++---
 signer/Cargo.toml | 2 +-
 tester/Cargo.toml | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/broker/Cargo.toml b/broker/Cargo.toml
index f789b29..a48e65a 100644
--- a/broker/Cargo.toml
+++ b/broker/Cargo.toml
@@ -10,8 +10,8 @@ rumqttd = "0.11.0"
 pretty_env_logger = "0.4.0"
 confy = "0.4.0"
 tokio = { version = "1.4.0", features = ["rt", "rt-multi-thread", "macros"] }
-vls-protocol = { path = "../../validating-lightning-signer/vls-protocol" }
-vls-proxy = { path = "../../validating-lightning-signer/vls-proxy" }
+vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer" }
+vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer" }
 sphinx-key-parser = { path = "../parser" }
 secp256k1 = { version = "0.20", features = ["rand-std", "bitcoin_hashes"] }
 anyhow = {version = "1", features = ["backtrace"]}
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index cf444d3..dc4905c 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-vls-protocol = { path = "../../validating-lightning-signer/vls-protocol" }
+vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer" }
 serde = { version = "1.0", default-features = false }
 serde_bolt = { version = "0.2", default-features = false }
 
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
index ae96ec9..98b2a49 100644
--- a/parser/src/lib.rs
+++ b/parser/src/lib.rs
@@ -22,7 +22,7 @@ pub fn request_from_msg<T: ser::Serialize + DeBolt>(
 ) -> vls_protocol::Result<Vec<u8>> {
     let mut md = MsgDriver::new_empty();
     msgs::write_serial_request_header(&mut md, sequence, dbid)?;
-    msgs::write(&mut md, msg).expect("failed to serial write");
+    msgs::write(&mut md, msg)?;
     Ok(md.bytes())
 }
 
@@ -38,8 +38,8 @@ pub fn raw_response_from_msg<T: ser::Serialize + DeBolt>(
 
 pub fn request_from_bytes<T: DeBolt>(msg: Vec<u8>) -> vls_protocol::Result<(T, u16, u64)> {
     let mut m = MsgDriver::new(msg);
-    let (sequence, dbid) = msgs::read_serial_request_header(&mut m).expect("read ping header");
-    let reply: T = msgs::read_message(&mut m).expect("failed to read ping message");
+    let (sequence, dbid) = msgs::read_serial_request_header(&mut m)?;
+    let reply: T = msgs::read_message(&mut m)?;
     Ok((reply, sequence, dbid))
 }
 
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
index 15b31ba..7a74189 100644
--- a/signer/Cargo.toml
+++ b/signer/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 sphinx-key-parser = { path = "../parser" }
-vls-protocol-signer = { path = "../../validating-lightning-signer/vls-protocol-signer", default-features = false, features = ["secp-lowmemory", "vls-std"] }
+vls-protocol-signer = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer", default-features = false, features = ["secp-lowmemory"] }
 anyhow = {version = "1", features = ["backtrace"]}
 log = "0.4"
 
diff --git a/tester/Cargo.toml b/tester/Cargo.toml
index ed2b329..1c2c64f 100644
--- a/tester/Cargo.toml
+++ b/tester/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 [dependencies]
 sphinx-key-signer = { path = "../signer" }
 sphinx-key-parser = { path = "../parser" }
-vls-protocol = { path = "../../validating-lightning-signer/vls-protocol" }
-vls-protocol-signer = { path = "../../validating-lightning-signer/vls-protocol-signer", default-features = false, features = ["secp-lowmemory", "vls-std"] }
+vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer" }
+vls-protocol-signer = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer", default-features = false, features = ["secp-lowmemory"] }
 anyhow = {version = "1", features = ["backtrace"]}
 log = "0.4"
 rumqttc = "0.12.0"