fix: fix some issues interfacing with go

Signed-off-by: Simon Gellis <simongellis@gmail.com>
hyperledger · Feb 7, 2025 · da51af6 · da51af6
1 parent ab9acd3
commit da51af6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/firefly-cardanoconnect/src/routes/ws.rs b/firefly-cardanoconnect/src/routes/ws.rs
@@ -83,6 +83,9 @@ async fn send_batch(socket: &mut WebSocket, topic: &str, batch: Batch) -> Result
             }
             error!("client couldn't process batch: {}", err.message);
         }
+        IncomingMessage::ListenReplies => {
+            // do nothing, we already send replies whether they ask or not
+        }
         other => {
             bail!("unexpected response to batch! {:?}", other);
         }
@@ -135,9 +138,10 @@ struct ErrorMessage {
 }
 
 #[derive(Debug, Deserialize)]
-#[serde(tag = "type", rename_all = "camelCase")]
+#[serde(tag = "type", rename_all = "lowercase")]
 enum IncomingMessage {
     Listen(ListenMessage),
+    ListenReplies,
     Ack(AckMessage),
     Error(ErrorMessage),
 }

diff --git a/firefly-cardanoconnect/src/streams/mux.rs b/firefly-cardanoconnect/src/streams/mux.rs
@@ -194,7 +194,7 @@ impl StreamDispatcher {
                 stream_id: stream.id,
                 batch_size: stream.batch_size,
                 batch_timeout: stream.batch_timeout,
-                batch_number: 0,
+                batch_number: 1,
                 listeners,
                 hwms,
                 persistence,

diff --git a/firefly-cardanoconnect/src/streams/types.rs b/firefly-cardanoconnect/src/streams/types.rs
@@ -44,6 +44,7 @@ pub enum ListenerType {
 #[serde(rename_all = "camelCase")]
 pub enum ListenerFilter {
     TransactionId(String),
+    #[serde(rename_all = "camelCase")]
     Event {
         contract: String,
         event_path: String,

diff --git a/scripts/demo/src/firefly.rs b/scripts/demo/src/firefly.rs
@@ -247,6 +247,7 @@ pub enum ListenerType {
 #[serde(rename_all = "camelCase")]
 pub enum ListenerFilter {
     TransactionId(String),
+    #[serde(rename_all = "camelCase")]
     Event {
         contract: String,
         event_path: String,