rename shared to common to disambiguate from 'shard'

backend/Cargo.lock

@@ -511,6 +511,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "common"
+version = "0.1.0"
+dependencies = [
+ "actix",
+ "actix-http",
+ "actix-web",
+ "actix-web-actors",
+ "bincode",
+ "bytes 1.0.1",
+ "fnv",
+ "hex",
+ "log",
+ "num-traits",
+ "primitive-types",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "const_fn"
 version = "0.4.2"
@@ -1635,11 +1656,11 @@ dependencies = [
  "bincode",
  "bytes 1.0.1",
  "clap",
+ "common",
  "log",
  "rustc-hash",
  "serde",
  "serde_json",
- "shared",
  "simple_logger",
  "soketto",
  "tokio",
@@ -1647,27 +1668,6 @@ dependencies = [
  "tokio-util",
 ]
 
-[[package]]
-name = "shared"
-version = "0.1.0"
-dependencies = [
- "actix",
- "actix-http",
- "actix-web",
- "actix-web-actors",
- "bincode",
- "bytes 1.0.1",
- "fnv",
- "hex",
- "log",
- "num-traits",
- "primitive-types",
- "rustc-hash",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.2.1"
@@ -1828,6 +1828,7 @@ dependencies = [
  "bytes 1.0.1",
  "chrono",
  "clap",
+ "common",
  "ctor",
  "log",
  "parking_lot",
@@ -1835,7 +1836,6 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "shared",
  "simple_logger",
 ]
 

backend/Cargo.toml

@@ -1,8 +1,8 @@
 [workspace]
 members = [
+    "common",
     "core",
-    "shared",
+    "shard"
-    "shard",
 ]
 
 [profile.dev]

backend/common/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "shared"
+name = "common"
 version = "0.1.0"
 authors = ["Parity Technologies Ltd. <admin@parity.io>"]
 edition = "2018"

backend/core/Cargo.toml

@@ -15,7 +15,7 @@ bytes = "1.0.1"
 chrono = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }
-shared = { path = "../shared" }
+common = { path = "../common" }
 log = "0.4"
 simple_logger = "1.11.0"
 parking_lot = "0.11"

backend/core/src/aggregator.rs

@@ -7,10 +7,10 @@ use crate::chain::{self, Chain, ChainId, Label};
 use crate::feed::connector::{Connected, FeedConnector, FeedId};
 use crate::feed::{self, FeedMessageSerializer};
 use crate::node::connector::NodeConnector;
-use shared::ws::MuteReason;
+use common::ws::MuteReason;
-use shared::shard::ShardConnId;
+use common::shard::ShardConnId;
-use shared::types::{ConnId, NodeDetails};
+use common::types::{ConnId, NodeDetails};
-use shared::util::{DenseMap, Hash};
+use common::util::{DenseMap, Hash};
 
 pub struct Aggregator {
     genesis_hashes: HashMap<Hash, ChainId>,

backend/core/src/chain.rs

@@ -7,9 +7,9 @@ use crate::aggregator::{Aggregator, DropChain, NodeCount, NodeSource, RenameChai
 use crate::feed::connector::{FeedConnector, FeedId, Subscribed, Unsubscribed};
 use crate::feed::{self, FeedMessageSerializer};
 use crate::node::Node;
-use shared::types::{Block, NodeDetails, NodeId, NodeLocation, Timestamp};
+use common::types::{Block, NodeDetails, NodeId, NodeLocation, Timestamp};
-use shared::util::{now, DenseMap, NumStats};
+use common::util::{now, DenseMap, NumStats};
-use shared::node::Payload;
+use common::node::Payload;
 
 const STALE_TIMEOUT: u64 = 2 * 60 * 1000; // 2 minutes
 

backend/core/src/feed.rs

@@ -4,7 +4,7 @@ use std::mem;
 
 use crate::node::Node;
 use serde_json::to_writer;
-use shared::types::{
+use common::types::{
     Address, BlockDetails, BlockHash, BlockNumber, NodeHardware, NodeIO, NodeId, NodeStats,
     Timestamp, NodeDetails,
 };

backend/core/src/feed/connector.rs

@@ -4,7 +4,7 @@ use crate::feed::{FeedMessageSerializer, Pong};
 use actix::prelude::*;
 use actix_web_actors::ws;
 use bytes::Bytes;
-use shared::util::fnv;
+use common::util::fnv;
 use std::time::{Duration, Instant};
 
 pub type FeedId = usize;

backend/core/src/location.rs

@@ -7,7 +7,7 @@ use rustc_hash::FxHashMap;
 use serde::Deserialize;
 
 use crate::chain::{Chain, LocateNode};
-use shared::types::{NodeId, NodeLocation};
+use common::types::{NodeId, NodeLocation};
 
 #[derive(Clone)]
 pub struct Locator {

backend/core/src/node.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use shared::types::{
+use common::types::{
     Block, BlockDetails, NodeDetails, NodeHardware, NodeIO, NodeId, NodeLocation, NodeStats,
     Timestamp,
 };
-use shared::util::now;
+use common::util::now;
-use shared::node::SystemInterval;
+use common::node::SystemInterval;
 
 pub mod connector;
 

backend/core/src/node/connector.rs

@@ -9,9 +9,9 @@ use crate::node::NodeId;
 use actix::prelude::*;
 use actix_web_actors::ws::{self, CloseReason};
 use bytes::Bytes;
-use shared::types::ConnId;
+use common::types::ConnId;
-use shared::ws::{MultipartHandler, WsMessage, MuteReason};
+use common::ws::{MultipartHandler, WsMessage, MuteReason};
-use shared::node::{NodeMessage, Payload};
+use common::node::{NodeMessage, Payload};
 
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(20);

backend/core/src/shard/connector.rs

@@ -8,10 +8,10 @@ use crate::location::LocateRequest;
 use actix::prelude::*;
 use actix_web_actors::ws::{self, CloseReason};
 use bincode::Options;
-use shared::types::NodeId;
+use common::types::NodeId;
-use shared::util::Hash;
+use common::util::Hash;
-use shared::ws::{MultipartHandler, WsMessage};
+use common::ws::{MultipartHandler, WsMessage};
-use shared::shard::{ShardMessage, ShardConnId, BackendMessage};
+use common::shard::{ShardMessage, ShardConnId, BackendMessage};
 
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(20);

backend/shard/Cargo.toml

@@ -17,7 +17,7 @@ log = "0.4"
 rustc-hash = "1.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }
-shared = { path = "../shared" }
+common = { path = "../common" }
 simple_logger = "1.11.0"
 soketto = "0.4.2"
 tokio = { version = "1", features = ["full"] }

backend/shard/src/aggregator.rs

@@ -6,10 +6,10 @@ use actix::prelude::*;
 use actix_http::http::Uri;
 use bincode::Options;
 use rustc_hash::FxHashMap;
-use shared::util::{Hash, DenseMap};
+use common::util::{Hash, DenseMap};
-use shared::types::{ConnId, NodeDetails, NodeId};
+use common::types::{ConnId, NodeDetails, NodeId};
-use shared::node::Payload;
+use common::node::Payload;
-use shared::shard::{ShardConnId, ShardMessage, BackendMessage};
+use common::shard::{ShardConnId, ShardMessage, BackendMessage};
 use soketto::handshake::{Client, ServerResponse};
 use crate::node::{NodeConnector, Initialize};
 use tokio::net::TcpStream;

backend/shard/src/node.rs

@@ -6,9 +6,9 @@ use crate::aggregator::{AddNode, Aggregator, ChainMessage};
 // use crate::chain::{Chain, RemoveNode, UpdateNode};
 use actix::prelude::*;
 use actix_web_actors::ws::{self, CloseReason};
-use shared::node::{NodeMessage, Payload};
+use common::node::{NodeMessage, Payload};
-use shared::types::{ConnId, NodeId};
+use common::types::{ConnId, NodeId};
-use shared::ws::{MultipartHandler, WsMessage};
+use common::ws::{MultipartHandler, WsMessage};
 use tokio::sync::mpsc::UnboundedSender;
 
 /// How often heartbeat pings are sent