Split bridge_engine into a few separate modules

1 files changed, 6 insertions, 7 deletions

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),
         };