Move shared bridge library code into `protocol` crate

17 files changed, 44 insertions, 27 deletions

diff --git a/Cargo.lock b/Cargo.lock
index b852fd1..fa97c01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1435,8 +1435,17 @@ dependencies = [
 name = "protocol"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "dotenv",
+ "env_logger",
+ "lazy_static",
+ "log",
+ "rand",
+ "regex",
  "serde",
  "serde_json",
+ "strum",
+ "strum_macros",
  "uuid",
 ]
 
@@ -2566,8 +2575,6 @@ dependencies = [
  "protocol",
  "rand",
  "regex",
- "strum",
- "strum_macros",
  "uuid",
  "wasm-bindgen-futures",
  "wasm-logger",
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index b217d93..473e0e3 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -9,3 +9,14 @@ edition = "2021"
 serde = { version = "1.0.145", features = ["derive"] }
 serde_json = "1.0.85"
 uuid = { version = "1.2.0", features = ["serde", "wasm-bindgen", "v4", "fast-rng"] }
+rand =  "0.8.4"
+anyhow = "1.0"
+strum = "0.24"
+strum_macros = "0.24"
+log = "0.4"
+regex = "1.0"
+lazy_static = "1.4"
+
+[dev-dependencies]
+env_logger = "0.8.4"
+dotenv = "0.15"
diff --git a/webapp/src/bridge_engine.rs b/protocol/src/bridge_engine.rs
index 808045d..808045d 100644
--- a/webapp/src/bridge_engine.rs
+++ b/protocol/src/bridge_engine.rs
diff --git a/webapp/src/card.rs b/protocol/src/card.rs
index 621bae1..621bae1 100644
--- a/webapp/src/card.rs
+++ b/protocol/src/card.rs
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
index b10e7e1..41268a9 100644
--- a/protocol/src/lib.rs
+++ b/protocol/src/lib.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
+pub mod card;
+pub mod bridge_engine;
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct UserInfo {
@@ -16,3 +18,11 @@ pub struct Table {
 pub struct TableView {
     pub m: String,
 }
+
+#[cfg(test)]
+mod tests {
+    pub fn test_setup() {
+        dotenv::dotenv().ok();
+        let _ = env_logger::builder().is_test(true).try_init();
+    }
+}
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
index fd048ab..fe1d53b 100644
--- a/webapp/Cargo.toml
+++ b/webapp/Cargo.toml
@@ -8,9 +8,6 @@ yew = "0.19"
 console_error_panic_hook = "0.1"
 wasm-logger = "0.2"
 log = "0.4"
-strum = "0.24"
-strum_macros = "0.24"
-rand =  "0.8.4"
 getrandom = { version = "0.2.7", features = ["js"] }
 wee_alloc = "0.4.3"
 anyhow = "1.0"
@@ -22,6 +19,7 @@ protocol = { path = "../protocol" }
 yew-router = "0.16.0"
 web-sys = { version = "0.3.60", features = ["Location", "Document"] }
 uuid = { version = "1.2.1", features = ["serde"] }
+rand =  "0.8.4"
 
 [dev-dependencies]
 env_logger = "0.8.4"
diff --git a/webapp/src/components.rs b/webapp/src/components.rs
index 018b1c3..aa3636f 100644
--- a/webapp/src/components.rs
+++ b/webapp/src/components.rs
@@ -1,4 +1,4 @@
-use crate::card::Suit;
+use protocol::card::Suit;
 
 mod app_context_provider;
 mod bidding;
diff --git a/webapp/src/components/bidding.rs b/webapp/src/components/bidding.rs
index 2825cbd..2c48ca3 100644
--- a/webapp/src/components/bidding.rs
+++ b/webapp/src/components/bidding.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::{self, BiddingResult, Contract, Player};
+use protocol::bridge_engine::{self, BiddingResult, Contract, Player};
 use crate::components::{BiddingBox, BiddingTable};
 use log::error;
 use yew::prelude::*;
diff --git a/webapp/src/components/bidding_box.rs b/webapp/src/components/bidding_box.rs
index 1d12369..0b384ec 100644
--- a/webapp/src/components/bidding_box.rs
+++ b/webapp/src/components/bidding_box.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::{Bid, Raise};
+use protocol::bridge_engine::{Bid, Raise};
 use crate::components::bid_css_class;
 use yew::prelude::*;
 
diff --git a/webapp/src/components/bidding_table.rs b/webapp/src/components/bidding_table.rs
index 8576ed6..0f1a824 100644
--- a/webapp/src/components/bidding_table.rs
+++ b/webapp/src/components/bidding_table.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::{Bid, Bidding, Player};
+use protocol::bridge_engine::{Bid, Bidding, Player};
 use crate::components::bid_css_class;
 use yew::prelude::*;
 
diff --git a/webapp/src/components/card.rs b/webapp/src/components/card.rs
index ff321e1..48d53e3 100644
--- a/webapp/src/components/card.rs
+++ b/webapp/src/components/card.rs
@@ -1,4 +1,4 @@
-use crate::card;
+use protocol::card;
 use crate::components::suit_css_class;
 use yew::prelude::*;
 
diff --git a/webapp/src/components/game.rs b/webapp/src/components/game.rs
index 34e073c..7ade948 100644
--- a/webapp/src/components/game.rs
+++ b/webapp/src/components/game.rs
@@ -1,7 +1,7 @@
-use crate::bridge_engine::{self, Contract, DealInPlay, DealInPlayResult, Player};
-use crate::card;
-use crate::card::Deal;
-use crate::card::Suit;
+use protocol::bridge_engine::{self, Contract, DealInPlay, DealInPlayResult, Player};
+use protocol::card;
+use protocol::card::Deal;
+use protocol::card::Suit;
 use crate::components::{Bidding, Hand, ShowBid, TrickInPlay, TricksPlayed};
 use log::{error, info};
 use yew::prelude::*;
diff --git a/webapp/src/components/hand.rs b/webapp/src/components/hand.rs
index 4a01508..7946a5c 100644
--- a/webapp/src/components/hand.rs
+++ b/webapp/src/components/hand.rs
@@ -1,4 +1,4 @@
-use crate::card;
+use protocol::card;
 use crate::components::card::Card;
 use yew::prelude::*;
 
diff --git a/webapp/src/components/show_bid.rs b/webapp/src/components/show_bid.rs
index 5914710..81cc7aa 100644
--- a/webapp/src/components/show_bid.rs
+++ b/webapp/src/components/show_bid.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::{Bidding, Contract};
+use protocol::bridge_engine::{Bidding, Contract};
 use yew::prelude::*;
 
 #[derive(PartialEq, Properties, Clone)]
diff --git a/webapp/src/components/trick_in_play.rs b/webapp/src/components/trick_in_play.rs
index 720fec0..c68239e 100644
--- a/webapp/src/components/trick_in_play.rs
+++ b/webapp/src/components/trick_in_play.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::TurnInPlay;
+use protocol::bridge_engine::TurnInPlay;
 use crate::components::Card;
 use yew::prelude::*;
 
diff --git a/webapp/src/components/tricks_played.rs b/webapp/src/components/tricks_played.rs
index 97a7cd1..d8f5a04 100644
--- a/webapp/src/components/tricks_played.rs
+++ b/webapp/src/components/tricks_played.rs
@@ -1,4 +1,4 @@
-use crate::bridge_engine::Trick;
+use protocol::bridge_engine::Trick;
 use yew::prelude::*;
 
 #[function_component(TricksPlayed)]
diff --git a/webapp/src/main.rs b/webapp/src/main.rs
index 35e69fd..25d12f1 100644
--- a/webapp/src/main.rs
+++ b/webapp/src/main.rs
@@ -4,8 +4,6 @@ use std::rc::Rc;
 use log::{debug, error, info, warn};
 use yew::prelude::*;
 use yew_router::prelude::*;
-pub mod bridge_engine;
-pub mod card;
 pub mod components;
 use components::{AppContext, AppContextProvider, ErrorInfo, Game, Table};
 use gloo_net::http::Request;
@@ -100,10 +98,3 @@ fn switch(routes: &Route) -> Html {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    pub fn test_setup() {
-        dotenv::dotenv().ok();
-        let _ = env_logger::builder().is_test(true).try_init();
-    }
-}