From a2c213d0aaf27f0c89baf533c0db7ccbd16965c3 Mon Sep 17 00:00:00 2001
From: Andreas Fackler <AndreasFackler@gmx.de>
Date: Tue, 26 Jun 2018 14:13:15 +0200
Subject: [PATCH] Replace convert_transaction with From.

---
 src/dynamic_honey_badger.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/dynamic_honey_badger.rs b/src/dynamic_honey_badger.rs
index 3fe9734..505acfe 100644
--- a/src/dynamic_honey_badger.rs
+++ b/src/dynamic_honey_badger.rs
@@ -87,8 +87,7 @@ where
     type Error = Error;
 
     fn input(&mut self, input: Self::Input) -> Result<()> {
-        let tx = self.convert_transaction(input);
-        self.honey_badger.input(tx)?;
+        self.honey_badger.input(input.into())?;
         self.process_output()
     }
 
@@ -143,13 +142,6 @@ where
         Ok(dyn_hb)
     }
 
-    fn convert_transaction(&self, input: Input<Tx, NodeUid>) -> Transaction<Tx, NodeUid> {
-        match input {
-            Input::User(tx) => Transaction::User(tx),
-            Input::Change(change) => Transaction::Change(change),
-        }
-    }
-
     /// Handles a message for the `HoneyBadger` instance.
     fn handle_honey_badger_message(
         &mut self,
@@ -381,6 +373,15 @@ enum Transaction<Tx, NodeUid> {
     Accept(NodeUid, Accept, Box<Signature>),
 }
 
+impl<Tx, NodeUid> From<Input<Tx, NodeUid>> for Transaction<Tx, NodeUid> {
+    fn from(input: Input<Tx, NodeUid>) -> Transaction<Tx, NodeUid> {
+        match input {
+            Input::User(tx) => Transaction::User(tx),
+            Input::Change(change) => Transaction::Change(change),
+        }
+    }
+}
+
 /// A batch of transactions the algorithm has output.
 #[derive(Clone)]
 pub struct Batch<Tx, NodeUid> {