From 3a527e69c840277411d5f24a3ecc3654b4cc72c7 Mon Sep 17 00:00:00 2001
From: James Wilson <james@jsdw.me>
Date: Wed, 16 Jun 2021 11:57:58 +0100
Subject: [PATCH] Get chatter between shard and core working

---
 backend/common/src/json/hash.rs | 6 ++++++
 backend/shard/src/aggregator.rs | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/common/src/json/hash.rs b/backend/common/src/json/hash.rs
index 01fbe1e..ed7ba4a 100644
--- a/backend/common/src/json/hash.rs
+++ b/backend/common/src/json/hash.rs
@@ -18,6 +18,12 @@ impl From<Hash> for crate::types::BlockHash {
     }
 }
 
+impl From<crate::types::BlockHash> for Hash {
+    fn from(hash: crate::types::BlockHash) -> Self {
+        Hash(hash.0)
+    }
+}
+
 struct HashVisitor;
 
 impl<'de> Visitor<'de> for HashVisitor {
diff --git a/backend/shard/src/aggregator.rs b/backend/shard/src/aggregator.rs
index 031a44d..ba19559 100644
--- a/backend/shard/src/aggregator.rs
+++ b/backend/shard/src/aggregator.rs
@@ -10,6 +10,7 @@ use common::util::{DenseMap};
 use common::types::{ConnId, NodeDetails, NodeId, BlockHash};
 use common::node::Payload;
 use common::shard::{ShardConnId, ShardMessage, BackendMessage};
+use common::json;
 use soketto::handshake::{Client, ServerResponse};
 use crate::node::{NodeConnector, Initialize};
 use tokio::net::TcpStream;
@@ -138,7 +139,8 @@ impl Chain {
     pub async fn connect(&self, tx: UnboundedSender<ChainMessage>) -> anyhow::Result<WsSender> {
         let host = self.url.host().unwrap_or("127.0.0.1");
         let port = self.url.port_u16().unwrap_or(8000);
-        let path = format!("{}{}", self.url.path(), self.genesis_hash);
+        let json_hash: json::Hash = self.genesis_hash.into();
+        let path = format!("{}{}", self.url.path(), json_hash);
 
         let socket = TcpStream::connect((host, port)).await?;