conform to go-metamodel cid encoding

pflow-xyz · Feb 25, 2024 · 19385e4 · 19385e4
1 parent d6964c8
commit 19385e4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/src/dsl.rs b/src/dsl.rs
@@ -41,11 +41,13 @@ impl<'a> FlowDsl for Builder<'a> {
     }
 
     fn arrow(&mut self, source: &str, target: &str, weight: i32) {
-        //TxNode::new(&self.net, label.to_string(), role.to_string(), pos)
+        assert!(weight > 0, "weight must be positive");
+        self.net.add_arc(source, target, Some(weight), None, None, None, None);
     }
 
     fn guard(&mut self, source: &str, target: &str, weight: i32) {
-        //TxNode::new(&self.net, label.to_string(), role.to_string(), pos)
+        assert!(weight > 0, "weight must be positive");
+        self.net.add_arc( source, target, None, None, None, Some(true), None);
     }
 }
 
@@ -74,11 +76,11 @@ mod tests {
         let model = declare(model_test_code);
         let vm = model.deref();
         let state = vm.initial_vector();
-        let res = vm.transform(state, "bar", 1);
+        let res = vm.transform(&state, "bar", 1);
 
         assert!(res.is_ok());
         // FIXME actually make state changes
-        //assert_ne!(res.output, state);
+        assert_ne!(res.output, state);
         println!("{:?}", res);
     }
 }
diff --git a/src/oid.rs b/src/oid.rs
@@ -8,7 +8,7 @@ pub struct Oid {
 impl Oid {
     pub fn new(bytes: &[u8]) -> Result<Self, Box<dyn std::error::Error>> {
         let hash = MultihashDigest::digest(&Code::Sha2_256, bytes);
-        let cid = Cid::new_v1(0x12, hash);
+        let cid = Cid::new_v1(0x55, hash); // NOTE: always produces string starting with "zb2"
         Ok(Self { cid })
     }
 
@@ -38,6 +38,6 @@ mod tests {
         let oid = Oid::new(DINING_PHILOSOPHERS.as_bytes()).expect("Failed to create Oid");
         let oid_string = oid.to_string();
         println!("oid_string: {:?}", oid_string);
-        assert_eq!(oid_string, "zUM7WNh744LkY5KqFcLXjP33St1HX5ajsu8KyqV6KfNiR87pU");
+        assert_eq!(oid_string, "zb2rhhAP4oqMEYFwLJ1UKgQrvBWsDkrvkY9Sn4HBVgfZ5ymNY");
     }
 }
diff --git a/src/petri_net.rs b/src/petri_net.rs
@@ -131,8 +131,16 @@ impl PetriNet {
         return;
     }
 
-    pub fn add_arc(&mut self, source: String, target: String, weight: Option<i32>, consume: Option<bool>, produce: Option<bool>, inhibit: Option<bool>, read: Option<bool>) {
-        self.arcs.push(Arrow { source, target, weight, consume, produce, inhibit, read });
+    pub fn add_arc(&mut self, source: &str, target: &str, weight: Option<i32>, consume: Option<bool>, produce: Option<bool>, inhibit: Option<bool>, read: Option<bool>) {
+        self.arcs.push(Arrow {
+            source: source.to_string(),
+            target: target.to_string(),
+            weight,
+            consume,
+            produce,
+            inhibit,
+            read
+        });
         return;
     }
 }

diff --git a/src/vasm.rs b/src/vasm.rs
@@ -83,14 +83,15 @@ impl StateMachine {
             let inhibit = arc.inhibit.unwrap_or(false);
             let read = arc.read.unwrap_or(false);
             if inhibit {
-                transitions.get_mut(&source).unwrap().guards.insert(target.clone(), Guard {
-                    delta: vec![0; vector_size],
-                    read: read,
-                });
+                // FIXME
+                // transitions.get_mut(&source).unwrap().guards.insert(target.clone(), Guard {
+                //     delta: vec![0; vector_size],
+                //     read: read,
+                // });
             } else {
                 assert_ne!(produce, consume, "must be either produce or consume");
                 if consume {
-                    transitions.get_mut(&source).unwrap().delta[model.places.get(&target).unwrap().offset as usize] = 0 - weight;
+                    transitions.get_mut(&target).unwrap().delta[model.places.get(&source).unwrap().offset as usize] = 0 - weight;
                 } else {
                     transitions.get_mut(&source).unwrap().delta[model.places.get(&target).unwrap().offset as usize] = weight;
                 }
@@ -137,7 +138,7 @@ impl Transaction {
 pub trait Vasm {
     fn empty_vector(&self) -> Vector;
     fn initial_vector(&self) -> Vector;
-    fn transform(&self, state: Vector, action: &str, multiple: i32) -> Transaction;
+    fn transform(&self, state: &Vector, action: &str, multiple: i32) -> Transaction;
 }
 
 pub fn declare(declaration: fn(&mut dyn FlowDsl)) -> Box<dyn Vasm> {
@@ -154,7 +155,7 @@ impl Vasm for StateMachine {
     }
 
     // REVIEW: test that this works properly
-    fn transform(&self, state: Vector, action: &str, multiple: i32) -> Transaction {
+    fn transform(&self, state: &Vector, action: &str, multiple: i32) -> Transaction {
         let transition = self.transitions.get(action).unwrap_or_else(|| panic!("no transition for {}", action));
         let mut output = state.clone();
         for (i, v) in transition.delta.iter().enumerate() {