From c2c7039cdf97ceb03aa1bd7beb464f2dbbf561d5 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Thu, 21 Apr 2022 19:06:47 +0200
Subject: [PATCH] Minor fixups.

---
 src/error.rs                       | 7 +++++++
 src/net2/protocol/protocol_ping.rs | 2 +-
 src/net2/session/manual_session.rs | 2 +-
 src/wallet/walletdb.rs             | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 4df4afe84..0768e492b 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -335,6 +335,13 @@ impl From<VerifyFailed> for ClientFailed {
     }
 }
 
+#[cfg(feature = "net2")]
+impl<T: std::fmt::Display> From<crate::net2::transport::TransportError<T>> for Error {
+    fn from(err: crate::net2::transport::TransportError<T>) -> Self {
+        Self::TransportError(err.to_string())
+    }
+}
+
 impl From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Self {
         Self::Io(err.kind())
diff --git a/src/net2/protocol/protocol_ping.rs b/src/net2/protocol/protocol_ping.rs
index 2bf5b9acc..f33117da9 100644
--- a/src/net2/protocol/protocol_ping.rs
+++ b/src/net2/protocol/protocol_ping.rs
@@ -62,7 +62,7 @@ impl<T: Transport> ProtocolPing<T> {
         debug!(target: "net", "ProtocolPing::run_ping_pong() [START]");
         loop {
             // Wait channel_heartbeat amount of time.
-            sleep(self.settings.channel_heartbeat_seconds).await;
+            sleep(self.settings.channel_heartbeat_seconds.into()).await;
 
             // Create a random nonce.
             let nonce = Self::random_nonce();
diff --git a/src/net2/session/manual_session.rs b/src/net2/session/manual_session.rs
index e62d294dc..484757dd3 100644
--- a/src/net2/session/manual_session.rs
+++ b/src/net2/session/manual_session.rs
@@ -98,7 +98,7 @@ impl<T: Transport> ManualSession<T> {
                 Err(err) => {
                     info!(target: "net", "Unable to connect to manual outbound [{}]: {}", addr, err);
 
-                    sleep(settings.connect_timeout_seconds).await;
+                    sleep(settings.connect_timeout_seconds.into()).await;
                 }
             }
         }
diff --git a/src/wallet/walletdb.rs b/src/wallet/walletdb.rs
index 8021f1831..05c6a48da 100644
--- a/src/wallet/walletdb.rs
+++ b/src/wallet/walletdb.rs
@@ -412,7 +412,7 @@ mod tests {
 
         let coin = Coin(pallas::Base::random(&mut OsRng));
         let nullifier = Nullifier::new(*s, serial);
-        let leaf_position = 0;
+        let leaf_position: incrementalmerkletree::Position = 0.into();
 
         OwnCoin { coin, note, secret: *s, nullifier, leaf_position }
     }