Monero Display and FromStr

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `"monero"` and `"xmr"` variants for Monero `FromStr` impl ([#192](https://github.com/farcaster-project/farcaster-core/pull/192))
+
+### Fixed
+
+- Fix `Display` implementation to work with any given writer ([#192](https://github.com/farcaster-project/farcaster-core/pull/192))
+
 ## [0.4.1] - 2021-12-05
 
 ### Added

src/monero.rs

@@ -10,7 +10,7 @@ use monero::util::key::{PrivateKey, PublicKey};
 use monero::Address;
 use monero::Amount;
 
-use std::fmt::{self, Debug, Display, Formatter};
+use std::fmt::{self, Debug};
 
 pub mod tasks;
 
@@ -74,16 +74,15 @@ impl std::str::FromStr for Monero {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "Monero" => Ok(Monero),
+            "Monero" | "monero" | "xmr" => Ok(Monero),
             _ => Err(crate::consensus::Error::UnknownType),
         }
     }
 }
 
-impl Display for Monero {
-    fn fmt(&self, _f: &mut Formatter<'_>) -> fmt::Result {
-        println!("xmr");
-        Ok(())
+impl fmt::Display for Monero {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "Monero")
     }
 }
 

src/negotiation.rs

@@ -680,7 +680,7 @@ mod tests {
 
     #[test]
     fn display_offer() {
-        assert_eq!(&format!("{}", *OFFER), "Network: Testnet\nBlockchain: Bitcoin<SegwitV0>\n- amount: 0.00001350 BTC\nBlockchain: \n- amount: 0.000000010000 XMR\nTimelocks\n- cancel: 4 blocks\n- punish: 6 blocks\nFee strategy: Fixed: 1 satoshi/vByte\nMaker swap role: Bob\n");
+        assert_eq!(&format!("{}", *OFFER), "Network: Testnet\nBlockchain: Bitcoin<SegwitV0>\n- amount: 0.00001350 BTC\nBlockchain: Monero\n- amount: 0.000000010000 XMR\nTimelocks\n- cancel: 4 blocks\n- punish: 6 blocks\nFee strategy: Fixed: 1 satoshi/vByte\nMaker swap role: Bob\n");
     }
 
     #[test]