From c496b2c61b62ec190cb8e4e0edda74e72aa38f43 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Tue, 8 Jun 2021 18:21:32 +0530
Subject: [PATCH] addvisitorresult::new takes mcaptcha

---
 src/master/embedded/counter.rs | 18 +++++++++---------
 src/master/mod.rs              |  9 +++++++++
 src/master/redis/master.rs     |  1 -
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/master/embedded/counter.rs b/src/master/embedded/counter.rs
index a0b8eb4..dc67e7c 100644
--- a/src/master/embedded/counter.rs
+++ b/src/master/embedded/counter.rs
@@ -151,14 +151,14 @@ impl Handler<DeleteVisitor> for Counter {
 #[rtype(result = "AddVisitorResult")]
 pub struct AddVisitor;
 
-impl AddVisitorResult {
-    fn new(m: &Counter) -> Self {
-        AddVisitorResult {
-            duration: m.0.get_duration(),
-            difficulty_factor: m.0.get_difficulty(),
-        }
-    }
-}
+//impl AddVisitorResult {
+//    fn new(m: &Counter) -> Self {
+//        AddVisitorResult {
+//            duration: m.0.get_duration(),
+//            difficulty_factor: m.0.get_difficulty(),
+//        }
+//    }
+//}
 
 impl Handler<AddVisitor> for Counter {
     type Result = MessageResult<AddVisitor>;
@@ -177,7 +177,7 @@ impl Handler<AddVisitor> for Counter {
         ctx.spawn(wait_for);
 
         self.0.add_visitor();
-        MessageResult(AddVisitorResult::new(&self))
+        MessageResult(AddVisitorResult::new(&self.0))
     }
 }
 
diff --git a/src/master/mod.rs b/src/master/mod.rs
index b5ad770..e2b4f86 100644
--- a/src/master/mod.rs
+++ b/src/master/mod.rs
@@ -68,3 +68,12 @@ pub struct AddSite {
     pub id: String,
     pub mcaptcha: MCaptcha,
 }
+
+impl AddVisitorResult {
+    fn new(m: &MCaptcha) -> Self {
+        AddVisitorResult {
+            duration: m.get_duration(),
+            difficulty_factor: m.get_difficulty(),
+        }
+    }
+}
diff --git a/src/master/redis/master.rs b/src/master/redis/master.rs
index 82e3c67..790e226 100644
--- a/src/master/redis/master.rs
+++ b/src/master/redis/master.rs
@@ -38,7 +38,6 @@ use crate::master::{AddSite, AddVisitor, Master as MasterTrait};
 
 use super::connection::RedisConnection;
 
-
 #[derive(Clone)]
 pub enum Redis {
     Single(Client),