Split bridge_engine into a few separate modules

7 files changed, 13 insertions, 11 deletions

diff --git a/webapp/src/components/bidding.rs b/webapp/src/components/bidding.rs
index 9b92930..cce854b 100644
--- a/webapp/src/components/bidding.rs
+++ b/webapp/src/components/bidding.rs
@@ -1,6 +1,6 @@
 use crate::components::{BiddingBox, BiddingTable};
 use log::error;
-use protocol::bridge_engine::{self, BiddingResult, Contract, Player};
+use protocol::{bridge_engine::{self, BiddingResult}, core::Player, contract::Contract};
 use yew::prelude::*;
 
 #[derive(PartialEq, Properties, Clone)]
diff --git a/webapp/src/components/bidding_box.rs b/webapp/src/components/bidding_box.rs
index 0b660ea..5d013e4 100644
--- a/webapp/src/components/bidding_box.rs
+++ b/webapp/src/components/bidding_box.rs
@@ -1,10 +1,10 @@
 use crate::components::bid_css_class;
-use protocol::bridge_engine::{Bid, Raise};
+use protocol::{contract::LevelAndSuit, actions::Bid};
 use yew::prelude::*;
 
 #[function_component(BiddingBox)]
 pub fn bidding_box(props: &BiddingBoxProps) -> Html {
-    let bids = Raise::all_raises().into_iter().map(|raise| {
+    let bids = LevelAndSuit::all_raises().into_iter().map(|raise| {
         let mut class = if Some(raise) <= props.current_bid {
             classes!("disabled")
         } else {
@@ -38,6 +38,6 @@ pub fn bidding_box(props: &BiddingBoxProps) -> Html {
 
 #[derive(PartialEq, Properties, Clone)]
 pub struct BiddingBoxProps {
-    pub current_bid: Option<Raise>,
+    pub current_bid: Option<LevelAndSuit>,
     pub on_bid: Callback<Bid>,
 }
diff --git a/webapp/src/components/bidding_table.rs b/webapp/src/components/bidding_table.rs
index 161f85a..d03779c 100644
--- a/webapp/src/components/bidding_table.rs
+++ b/webapp/src/components/bidding_table.rs
@@ -1,5 +1,5 @@
 use crate::components::bid_css_class;
-use protocol::bridge_engine::{Bid, Bidding, Player};
+use protocol::{actions::Bid, core::Player, bridge_engine::Bidding};
 use yew::prelude::*;
 
 #[function_component(BiddingTable)]
diff --git a/webapp/src/components/show_bid.rs b/webapp/src/components/show_bid.rs
index 81cc7aa..a292b5c 100644
--- a/webapp/src/components/show_bid.rs
+++ b/webapp/src/components/show_bid.rs
@@ -1,4 +1,4 @@
-use protocol::bridge_engine::{Bidding, Contract};
+use protocol::{bridge_engine::Bidding, contract::Contract};
 use yew::prelude::*;
 
 #[derive(PartialEq, Properties, Clone)]
diff --git a/webapp/src/components/table.rs b/webapp/src/components/table.rs
index c8bdf6b..c1b4b47 100644
--- a/webapp/src/components/table.rs
+++ b/webapp/src/components/table.rs
@@ -3,11 +3,13 @@ use crate::components::{BiddingBox, BiddingTable, Hand, TrickInPlay, HandDiagram
 use crate::{services, use_app_context};
 use futures::FutureExt;
 use log::info;
+use protocol::actions::Bid;
 use protocol::bridge_engine::{
-    Bid, BiddingStatePlayerView, GameStatePlayerView, PlayResult,
-    PlayStatePlayerView, Player, TableStatePlayerView,
+    BiddingStatePlayerView, GameStatePlayerView, PlayResult,
+    PlayStatePlayerView, TableStatePlayerView,
 };
 use protocol::card::Card;
+use protocol::core::Player;
 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 509b06c..883a3c1 100644
--- a/webapp/src/components/trick_in_play.rs
+++ b/webapp/src/components/trick_in_play.rs
@@ -1,5 +1,5 @@
 use crate::components::Card;
-use protocol::bridge_engine::{Player, Trick};
+use protocol::{bridge_engine::Trick, core::Player};
 use yew::prelude::*;
 
 #[function_component(TrickInPlay)]
diff --git a/webapp/src/services.rs b/webapp/src/services.rs
index cd0c649..61f9c69 100644
--- a/webapp/src/services.rs
+++ b/webapp/src/services.rs
@@ -1,9 +1,9 @@
 use anyhow::Context;
 use gloo_net::http::Request;
 use protocol::{
-    bridge_engine::{Bid, TableStatePlayerView},
+    bridge_engine::{TableStatePlayerView},
     card::Card,
-    Table,
+    Table, actions::Bid,
 };
 
 use crate::utils::ok_json;