fix cli test

Author: jbesraa

lightning/src/ln/msgs.rs

@@ -40,7 +40,6 @@ use core::convert::TryInto;
 use core::fmt;
 use core::fmt::Debug;
 use core::str::FromStr;
-use std::net::{AddrParseError, Ipv4Addr, Ipv6Addr, SocketAddr};
 use crate::io::{self, Read};
 use crate::io_extras::read_to_end;
 
@@ -895,19 +894,20 @@ impl Readable for NetAddress {
 	}
 }
 
+#[cfg(feature = "std")]
 impl FromStr for NetAddress {
-    type Err = AddrParseError;
+    type Err = std::net::AddrParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match SocketAddr::from_str(s) {
+        match std::net::SocketAddr::from_str(s) {
             Ok(addr) => {
                 let port: u16 = addr.port();
                 match addr {
-                    SocketAddr::V4(addr) => {
+                    std::net::SocketAddr::V4(addr) => {
                         let addr = addr.ip().octets();
                         return Ok(NetAddress::IPv4 { addr, port });
                     },
-                    SocketAddr::V6(addr) => {
+                    std::net::SocketAddr::V6(addr) => {
                         let addr = addr.ip().octets();
                         return Ok(NetAddress::IPv6 { addr, port });
                     },
@@ -2472,7 +2472,7 @@ impl_writeable_msg!(GossipTimestampFilter, {
 	timestamp_range,
 }, {});
 
-#[cfg(test)]
+#[cfg(all(test, not(feature = "no-std")))]
 mod tests {
 	use bitcoin::{Transaction, PackedLockTime, TxIn, Script, Sequence, Witness, TxOut};
 	use hex;

lightning/src/util/base32.rs

@@ -20,6 +20,8 @@
 // SOFTWARE.
 // (reference https://github.com/andreasots/base32/blob/master/LICENSE-MIT)
 
+use crate::prelude::*;
+
 /// Alphabet used for encoding and decoding.
 #[derive(Copy, Clone)]
 pub enum Alphabet {