addvisitorresult::new takes mcaptcha

src/master/embedded/counter.rs

@@ -151,14 +151,14 @@ impl Handler<DeleteVisitor> for Counter {
 #[rtype(result = "AddVisitorResult")]
 pub struct AddVisitor;
 
-impl AddVisitorResult {
+//impl AddVisitorResult {
-    fn new(m: &Counter) -> Self {
+//    fn new(m: &Counter) -> Self {
-        AddVisitorResult {
+//        AddVisitorResult {
-            duration: m.0.get_duration(),
+//            duration: m.0.get_duration(),
-            difficulty_factor: m.0.get_difficulty(),
+//            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))
     }
 }
 

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(),
+        }
+    }
+}

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),