clean code

node/zombienet-backchannel/Cargo.toml

@@ -1,8 +1,3 @@
-[package]
-name = "backchannel-cli"
-version = "0.1.0"
-edition = "2021"
-
 [package]
 name = "zombienet-backchannel"
 description = "Zombienet backchannel to notify test runner and coordinate with malus actors."
@@ -16,7 +11,6 @@ publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-# futures-channel = "0.3"
 tokio = { version = "1.0.0", default-features = false, features = ["macros", "net", "rt-multi-thread"] }
 url = "2.0.0"
 tokio-tungstenite = "0.16"
@@ -25,3 +19,4 @@ parity-scale-codec = { version = "2.3.1", features = ["derive"] }
 reqwest = "0.11"
 thiserror = "1.0.30"
 log = "0.4.13"
+lazy_static = "1.4.0"

node/zombienet-backchannel/src/errors.rs

@@ -0,0 +1,27 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Polkadot Zombienet Bacjchannel error definitions.
+
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+pub enum BackchannelError {
+	#[error("Error connecting websocket server")]
+	CantConnectToWS,
+
+	#[error("Error sending new value to backchannel")]
+	SendItemFail,
+}

node/zombienet-backchannel/src/lib.rs

@@ -1,12 +1,29 @@
-/// Provides a backchannel to zombienet test runner.
+// Copyright 2017-2021 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
 
-use std::env;
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+/// Provides a backchannel to zombienet test runner.
+use std::env;
 use futures_util::{StreamExt, stream::SplitStream};
 use tokio::net::TcpStream;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream, connect_async};
 use parity_scale_codec as scale_codec;
 
+#[macro_use]
+extern crate lazy_static;
+
 mod errors;
 use errors::BackchannelError;
 
@@ -15,15 +32,15 @@ pub struct ZombienetBackchannel {
     pub inner: SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>
 }
 
-const BACKCHANNEL_HOST: &str = "backchannel";
-const BACKCHANNEL_PORT: &str = "3000";
+lazy_static! {
+    static ref BACKCHANNEL_HOST: String = env::var("BACKCHANNEL_HOST").unwrap_or_else(|_| "backchannel".to_string());
+    static ref BACKCHANNEL_PORT: String = env::var("BACKCHANNEL_PORT").unwrap_or_else(|_| "3000".to_string());
+}
+
 
 impl ZombienetBackchannel {
     pub async fn connect() -> Result<ZombienetBackchannel,BackchannelError> {
-        let backchannel_host = env::var("BACKCHANNEL_HOST").unwrap_or_else(|_| BACKCHANNEL_HOST.to_string());
-        let backchannel_port = env::var("BACKCHANNEL_PORT").unwrap_or_else(|_| BACKCHANNEL_PORT.to_string());
-
-        let ws_url = format!("ws://{}:{}/ws", backchannel_host, backchannel_port);
+        let ws_url = format!("ws://{}:{}/ws", *BACKCHANNEL_HOST, *BACKCHANNEL_PORT);
         log::debug!("Connecting to : {}",&ws_url);
         let (ws_stream, _) = connect_async(ws_url).await.map_err(|_| BackchannelError::CantConnectToWS)?;
         let (_write, read) = ws_stream.split();
@@ -34,13 +51,10 @@ impl ZombienetBackchannel {
     }
 
     pub async fn send(key: &'static str, val: impl scale_codec::Encode) -> Result<(),BackchannelError> {
-        let backchannel_host = env::var("BACKCHANNEL_HOST").unwrap_or_else(|_| BACKCHANNEL_HOST.to_string());
-        let backchannel_port = env::var("BACKCHANNEL_PORT").unwrap_or_else(|_| BACKCHANNEL_PORT.to_string());
-
         let client = reqwest::Client::new();
         let encoded = val.encode();
         let body = String::from_utf8_lossy(&encoded);
-        let zombienet_endpoint = format!("http://{}:{}/{}",backchannel_host, backchannel_port, key);
+        let zombienet_endpoint = format!("http://{}:{}/{}", *BACKCHANNEL_HOST, *BACKCHANNEL_PORT, key);
 
         log::debug!("Sending to : {}",&zombienet_endpoint);
         let _res = client.post(zombienet_endpoint)