Merge pull request hyperledger-archives#1721 from aludvik/rust-csdk-e…

…ngine-trait

Remove Sync + Send trait bound from Rust Consensus Engine trait

sdk/examples/devmode_rust/src/engine.rs

@@ -186,19 +186,17 @@ impl DevmodeService {
     }
 }
 
-pub struct DevmodeEngine {
-    exit: Exit,
-}
+pub struct DevmodeEngine {}
 
 impl DevmodeEngine {
     pub fn new() -> Self {
-        DevmodeEngine { exit: Exit::new() }
+        DevmodeEngine {}
     }
 }
 
 impl Engine for DevmodeEngine {
     fn start(
-        &self,
+        &mut self,
         updates: Receiver<Update>,
         service: Box<Service>,
         mut chain_head: Block,
@@ -219,15 +217,14 @@ impl Engine for DevmodeEngine {
         loop {
             let incoming_message = updates.recv_timeout(time::Duration::from_millis(10));
 
-            if self.exit.get() {
-                break;
-            }
-
             match incoming_message {
                 Ok(update) => {
                     debug!("Received message: {:?}", update);
 
                     match update {
+                        Update::Shutdown => {
+                            break;
+                        }
                         Update::BlockNew(block) => {
                             info!("Checking consensus data: {:?}", block);
 
@@ -333,10 +330,6 @@ impl Engine for DevmodeEngine {
         }
     }
 
-    fn stop(&self) {
-        self.exit.set();
-    }
-
     fn version(&self) -> String {
         "0.1".into()
     }

sdk/examples/devmode_rust/src/main.rs

@@ -33,7 +33,7 @@ use log4rs::config::{Appender, Config, Root};
 use log4rs::encode::pattern::PatternEncoder;
 
 use engine::DevmodeEngine;
-use sawtooth_sdk::consensus::{driver::Driver, zmq_driver::ZmqDriver};
+use sawtooth_sdk::consensus::zmq_driver::ZmqDriver;
 
 fn main() {
     let matches = clap_app!(intkey =>
@@ -76,9 +76,8 @@ fn main() {
         process::exit(1);
     });
 
-    let driver = ZmqDriver::new(Box::new(DevmodeEngine::new()));
-
-    driver.start(&endpoint).unwrap_or_else(|err| {
+    let (driver, _stop) = ZmqDriver::new();
+    driver.start(endpoint, DevmodeEngine::new()).unwrap_or_else(|err| {
         error!("{}", err);
         process::exit(1);
     });