Split bridge_engine into a few separate modules

4 files changed, 11 insertions, 11 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 3e3985f..d6fc222 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -10,8 +10,9 @@ use axum::{
     Json, Router,
 };
 use protocol::{
-    bridge_engine::{Bid, Player, TableStatePlayerView},
+    bridge_engine::TableStatePlayerView,
     card::Card,
+    actions::Bid, core::Player
 };
 use protocol::{Table, UserInfo};
 use server::server::ServerState;
diff --git a/server/src/play.rs b/server/src/play.rs
index a825ece..893cb95 100644
--- a/server/src/play.rs
+++ b/server/src/play.rs
@@ -1,11 +1,13 @@
 use async_trait::async_trait;
 use protocol::{
+    actions::Bid,
     bot::{BiddingBot, PlayingBot},
     bridge_engine::{
-        Bid, BiddingStatePlayerView, Deal, PlayResult, GameState,
-        PlayStatePlayerView, Player, TableState,
+        BiddingStatePlayerView, GameState, PlayResult, PlayStatePlayerView,
+        TableState,
     },
     card::Card,
+    core::{Deal, Player},
     simple_bots::{AlwaysPassBiddingBot, RandomPlayingBot},
 };
 use rand::random;
@@ -294,10 +296,7 @@ pub async fn advance_play<J: Journal<TableUpdate>>(
 
 #[cfg(test)]
 mod test {
-    use protocol::{
-        bridge_engine::{ContractLevel, Raise},
-        card::Suit,
-    };
+    use protocol::{contract::{LevelAndSuit, ContractLevel}, card::Suit};
     use serde_json::json;
     use tracing::info;
 
@@ -392,7 +391,7 @@ mod test {
         test_setup();
         let mut t1 = Table::new(TestJournal::new()).await.unwrap();
         assert!(t1.game().is_ok());
-        let raise1c = Raise {
+        let raise1c = LevelAndSuit {
             level: ContractLevel::One,
             suit: Some(Suit::Club),
         };
diff --git a/server/src/table.rs b/server/src/table.rs
index 068fb24..cc00327 100644
--- a/server/src/table.rs
+++ b/server/src/table.rs
@@ -2,10 +2,10 @@ use async_trait::async_trait;
 use protocol::{
     bot::{BiddingBot, PlayingBot},
     bridge_engine::{
-        Bid, BiddingStatePlayerView, GameState, PlayStatePlayerView, TableState,
+        BiddingStatePlayerView, GameState, PlayStatePlayerView, TableState,
     },
     card::Card,
-    simple_bots::{AlwaysPassBiddingBot, RandomPlayingBot},
+    simple_bots::{AlwaysPassBiddingBot, RandomPlayingBot}, actions::Bid,
 };
 use rand::random;
 
diff --git a/server/tests/table_test.rs b/server/tests/table_test.rs
index 4d80f32..bece8ae 100644
--- a/server/tests/table_test.rs
+++ b/server/tests/table_test.rs
@@ -1,4 +1,4 @@
-use protocol::{card::{Rank, Suit}, bridge_engine::TableState};
+use protocol::bridge_engine::TableState;
 use server::table::{Table, InMemoryTable};
 
 mod common;