Start moving to a trait for Participant API

process function still needs some work

Author: jonnor

examples/repeat.rs

@@ -1,21 +1,29 @@
-
 extern crate msgflo;
 
-use msgflo::participant::{Participant, InfoBuilder};
+use msgflo::participant::{ParticipantTrait, InfoBuilder, Info};
 
-fn main() {
-    let info =  InfoBuilder::new("rust/Repeat")
-        .label("Repeats input as-is")
-        .inport("in")
-        .outport("out")
-        .build();
+struct Repeat {
+    state: Option<String>, // we don't really have any state
+}
+
+impl ParticipantTrait for Repeat {
 
-    fn process_repeat(input: Vec<u8>) -> Result<Vec<u8>, Vec<u8>> {
-        println!("process_repeat:");
-        return Ok(input);
+    fn info(&self) -> Info {
+        InfoBuilder::new("rust/Repeat")
+            .label("Repeats input as-is")
+            .inport("in")
+            .outport("out")
+            .build()
     }
 
-    let p = Participant { info: info, process: process_repeat };
+}
+
+fn process(input: Vec<u8>) -> Result<Vec<u8>, Vec<u8>> {
+    println!("repeat process():");
+    return Ok(input);
+}
 
-    msgflo::participant::main(p);
+fn main() {
+    let r = Repeat { state: None };
+    msgflo::participant::main(&r, process);
 }

src/participant.rs

@@ -67,9 +67,15 @@ impl InfoBuilder {
 
 type SendFunction = fn(String, Vec<u8>);
 pub type ProcessFunction = fn(Vec<u8>) -> Result<Vec<u8>, Vec<u8>>;
-pub struct Participant {
-    pub info: Info,
-    pub process: ProcessFunction,
+
+pub trait ParticipantTrait {
+    fn info(&self) -> Info;
+//    fn process(&self, Vec<u8>) -> Result<Vec<u8>, Vec<u8>>;
+}
+
+struct Participant {
+    info: Info,
+    process: ProcessFunction
 }
 
 struct Connection {
@@ -265,13 +271,15 @@ fn parse(options: &mut Options) {
 // XXX: seems rust-amqp makes program hangs forever if error occurs / channel is borked?
 // TODO: pass port info in/out of process()
 // TODO: nicer way to declare ports? ideally they are enums not stringly typed?
-pub fn main(orig: Participant) {
+pub fn main(orig: &ParticipantTrait, func: ProcessFunction) {
 
     let mut options = Options { .. Default::default() };
     parse(&mut options);
 
-    let info = normalize_info(&orig.info, &options);
-    let p = Participant { info: info, process: orig.process }; // XXX: hack
+    let i : Info = orig.info();
+    let info = normalize_info(&i, &options);
+
+    let p = Participant { info: info, process: func }; // XXX: hack
 
     let mut c = start_participant(&p, &options);
     println!("{}({}) started", &p.info.role, &p.info.component);