fixed request moves event to have the correct fen string

engine/src/lib.rs

@@ -1,14 +1,14 @@
 mod bitboard;
-pub mod chessmove;
-pub mod piecetype;
 pub mod boardsquare;
-pub mod movetype;
+pub mod chessmove;
 pub mod gameend;
+pub mod movetype;
+pub mod piecetype;
 
-use chessmove::ChessMove;
-use gameend::GameEnd;
 use bitboard::board::Board;
 use bitboard::movebuffer::MoveBuffer;
+use chessmove::ChessMove;
+use gameend::GameEnd;
 
 pub fn get_available_moves(fen: &str) -> Vec<ChessMove> {
     let mut board = Board::build(fen);
@@ -22,7 +22,10 @@ pub fn get_available_moves(fen: &str) -> Vec<ChessMove> {
         generated_moves.push(ChessMove::from_bitmove(buffer.get(idx), &board));
     }
 
-  println!("get_available_moves resulted in {} moves", generated_moves.len());
+    println!(
+        "get_available_moves resulted in {} moves",
+        generated_moves.len()
+    );
     return generated_moves;
 }
 
@@ -39,7 +42,11 @@ pub fn is_game_over(fen: &str) -> Option<GameEnd> {
     if !in_check {
         return Some(GameEnd::Draw("".to_string()));
     }
-  return if board.side_to_move() == 0 { Some(GameEnd::BlackWon("".to_string())) } else { Some(GameEnd::WhiteWon("".to_string())) };
+    return if board.side_to_move() == 0 {
+        Some(GameEnd::BlackWon("".to_string()))
+    } else {
+        Some(GameEnd::WhiteWon("".to_string()))
+    };
 }
 
 pub fn get_board_after_move(fen: &str, chess_move: &ChessMove) -> String {
@@ -55,8 +62,8 @@ pub fn get_board_after_move(fen: &str, chess_move: &ChessMove) -> String {
 #[cfg(test)]
 mod tests {
     use crate::boardsquare::BoardSquare;
-  use crate::piecetype::PieceType::*;
     use crate::gameend::GameEnd;
+    use crate::piecetype::PieceType::*;
 
     use super::*;
 
@@ -65,9 +72,7 @@ mod tests {
             canonical(self) == canonical(other)
         }
     }
-  impl Eq for ChessMove {
+    impl Eq for ChessMove {}
-
-  }
     impl Ord for ChessMove {
         fn cmp(&self, other: &Self) -> std::cmp::Ordering {
             let lhs = canonical(self);
@@ -81,27 +86,36 @@ mod tests {
         }
     }
 
-  impl PartialEq for GameEnd {
-    fn eq(&self, other: &Self) -> bool {
-    match (self, other) {
-      (GameEnd::WhiteWon(a), GameEnd::WhiteWon(b)) => a == b,
-      (GameEnd::BlackWon(a), GameEnd::BlackWon(b)) => a == b,
-      (GameEnd::Draw(a),     GameEnd::Draw(b))     => a == b,
-      _ => false,
-    }
-  }
-}
-
     fn canonical(m: &ChessMove) -> (u8, u8, u8) {
         match m {
-      ChessMove::Quiet { piece_type, from_square, to_square, promotion_piece } =>
+            ChessMove::Quiet {
-      (0, from_square.to_index(), to_square.to_index()),
+                piece_type,
-      ChessMove::Capture { piece_type, from_square, to_square, captured_piece, promotion_piece } =>
+                from_square,
-      (1, from_square.to_index(), to_square.to_index()),
+                to_square,
-      ChessMove::Castle { king_type, king_from, king_to, rook_type, rook_from, rook_to } =>
+                promotion_piece,
-      (2, king_from.to_index(), king_to.to_index()),
+            } => (0, from_square.to_index(), to_square.to_index()),
-      ChessMove::EnPassant { pawn_type, from_square, to_square, captured_piece, captured_from } =>
+            ChessMove::Capture {
-      (3, from_square.to_index(), to_square.to_index()),
+                piece_type,
+                from_square,
+                to_square,
+                captured_piece,
+                promotion_piece,
+            } => (1, from_square.to_index(), to_square.to_index()),
+            ChessMove::Castle {
+                king_type,
+                king_from,
+                king_to,
+                rook_type,
+                rook_from,
+                rook_to,
+            } => (2, king_from.to_index(), king_to.to_index()),
+            ChessMove::EnPassant {
+                pawn_type,
+                from_square,
+                to_square,
+                captured_piece,
+                captured_from,
+            } => (3, from_square.to_index(), to_square.to_index()),
         }
     }
 
@@ -109,78 +123,387 @@ mod tests {
     fn get_available_moves_test() {
         let boards: [&str; 2] = [
             "rnbqkbnr/pppppppp/8/1B6/4P3/5P1N/PPPP2PP/RNBQK2R w KQkq e6 0 1",
-      "6Bn/B2Pk3/8/p1r3NK/3p4/b6P/3p2n1/2R5 w - - 0 1"
+            "6Bn/B2Pk3/8/p1r3NK/3p4/b6P/3p2n1/2R5 w - - 0 1",
         ];
         let mut expected_moves: Vec<Vec<ChessMove>> = vec![
             vec![
-        ChessMove::capture(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(3, 6), BlackPawn, None),
+                ChessMove::capture(
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(0, 1), BoardSquare::from_coord(0, 2), None),
+                    WhiteBishop,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(0, 1), BoardSquare::from_coord(0, 3), None),
+                    BoardSquare::from_coord(1, 4),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(1, 1), BoardSquare::from_coord(1, 2), None),
+                    BoardSquare::from_coord(3, 6),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(1, 1), BoardSquare::from_coord(1, 3), None),
+                    BlackPawn,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(2, 1), BoardSquare::from_coord(2, 2), None),
+                    None,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(2, 1), BoardSquare::from_coord(2, 3), None),
+                ),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 1), BoardSquare::from_coord(3, 2), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 1), BoardSquare::from_coord(3, 3), None),
+                    WhitePawn,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(4, 3), BoardSquare::from_coord(4, 4), None),
+                    BoardSquare::from_coord(0, 1),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(5, 2), BoardSquare::from_coord(5, 3), None),
+                    BoardSquare::from_coord(0, 2),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(6, 1), BoardSquare::from_coord(6, 2), None),
+                    None,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(6, 1), BoardSquare::from_coord(6, 3), None),
+                ),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(1, 0), BoardSquare::from_coord(0, 2), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(1, 0), BoardSquare::from_coord(2, 2), None),
+                    WhitePawn,
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(6, 0), None),
+                    BoardSquare::from_coord(0, 1),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(5, 1), None),
+                    BoardSquare::from_coord(0, 3),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(5, 3), None),
+                    None,
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(6, 4), None),
+                ),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(5, 0), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(4, 1), None),
+                    WhitePawn,
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(3, 2), None),
+                    BoardSquare::from_coord(1, 1),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(2, 3), None),
+                    BoardSquare::from_coord(1, 2),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(0, 3), None),
+                    None,
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(0, 5), None),
+                ),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(2, 5), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(6, 0), None),
+                    WhitePawn,
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(5, 0), None),
+                    BoardSquare::from_coord(1, 1),
-        ChessMove::quiet(WhiteQueen, BoardSquare::from_coord(3, 0), BoardSquare::from_coord(4, 1), None),
+                    BoardSquare::from_coord(1, 3),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(4, 1), None),
+                    None,
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(5, 1), None),
+                ),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(5, 0), None),
+                ChessMove::quiet(
-        ChessMove::castle(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(6, 0), WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(5, 0))
+                    WhitePawn,
+                    BoardSquare::from_coord(2, 1),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(2, 1),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 1),
+                    BoardSquare::from_coord(3, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 1),
+                    BoardSquare::from_coord(3, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(4, 3),
+                    BoardSquare::from_coord(4, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(5, 2),
+                    BoardSquare::from_coord(5, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(6, 1),
+                    BoardSquare::from_coord(6, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(6, 1),
+                    BoardSquare::from_coord(6, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(1, 0),
+                    BoardSquare::from_coord(0, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(1, 0),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(5, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(5, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(6, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(3, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(0, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(0, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(2, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteQueen,
+                    BoardSquare::from_coord(3, 0),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(5, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::castle(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(6, 0),
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(5, 0),
+                ),
             ],
             vec![
-        ChessMove::capture(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(2, 4), BlackRook, None),
+                ChessMove::capture(
-        ChessMove::capture(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 4), BlackRook, None),
+                    WhiteBishop,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(7, 3), None),
+                    BoardSquare::from_coord(0, 6),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteQueen)),
+                    BoardSquare::from_coord(2, 4),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteRook)),
+                    BlackRook,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteBishop)),
+                    None,
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteKnight)),
+                ),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(1, 5), None),
+                ChessMove::capture(
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(1, 7), None),
+                    WhiteRook,
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(7, 6), None),
+                    BoardSquare::from_coord(2, 0),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(5, 6), None),
+                    BoardSquare::from_coord(2, 4),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(4, 5), None),
+                    BlackRook,
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(3, 4), None),
+                    None,
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(2, 3), None),
+                ),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(1, 2), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(0, 1), None),
+                    WhitePawn,
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(0, 0), None),
+                    BoardSquare::from_coord(7, 2),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(1, 0), None),
+                    BoardSquare::from_coord(7, 3),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(3, 0), None),
+                    None,
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(4, 0), None),
+                ),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(5, 0), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(6, 0), None),
+                    WhitePawn,
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(7, 0), None),
+                    BoardSquare::from_coord(3, 6),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 1), None),
+                    BoardSquare::from_coord(3, 7),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 2), None),
+                    Some(WhiteQueen),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 3), None),
+                ),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(7, 4), BoardSquare::from_coord(6, 3), None),
+                ChessMove::quiet(
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(7, 4), BoardSquare::from_coord(7, 5), None)
+                    WhitePawn,
-      ]
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteRook),
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteBishop),
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteKnight),
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(0, 6),
+                    BoardSquare::from_coord(1, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(0, 6),
+                    BoardSquare::from_coord(1, 7),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(7, 6),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(5, 6),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(4, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(3, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(1, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(0, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(0, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(1, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(3, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(4, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(7, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(7, 4),
+                    BoardSquare::from_coord(6, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(7, 4),
+                    BoardSquare::from_coord(7, 5),
+                    None,
+                ),
+            ],
         ];
 
         for case in 0..2 {
-
             let mut generated_moves = get_available_moves(boards[case]);
 
             generated_moves.sort();
@@ -192,18 +515,17 @@ mod tests {
 
     #[test]
     fn is_game_over_test() {
-
         let boards: [&str; 4] = [
             "2k5/3pn3/2pP4/1R1P3B/1Np5/3RPp2/1B6/6Kb w - - 0 1",
             "2K3B1/4P3/8/7p/4pPn1/1N1P1p1p/4bp2/2Rk4 b - - 0 1",
             "6N1/B2PP3/pR1b4/3P2nb/6P1/3P1k2/2p5/4r1K1 w - - 0 1",
-      "3n1K2/p2k1p2/5P2/b1p2P2/P7/8/3p2r1/8 w - - 0 1"
+            "3n1K2/p2k1p2/5P2/b1p2P2/P7/8/3p2r1/8 w - - 0 1",
         ];
         let expected_results: [Option<GameEnd>; 4] = [
             None,
             Some(GameEnd::WhiteWon("".to_string())),
             Some(GameEnd::BlackWon("".to_string())),
-      Some(GameEnd::Draw("".to_string()))
+            Some(GameEnd::Draw("".to_string())),
         ];
 
         for case in 0..4 {
@@ -213,3 +535,4 @@ mod tests {
         }
     }
 }
+

server/src/connection.rs

@@ -193,12 +193,12 @@ pub async fn handle_connection(
 
     info!("id: {}", &player_id);
 
-    error!("\n\n\n");
+    println!("\n\n\n");
     println!(
         "{:?}",
         engine::get_available_moves("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1")
     );
-    error!("\n\n\n");
+    println!("\n\n\n");
 
     // Message processing loop
     while let Some(Ok(message)) = read.next().await {
@@ -243,7 +243,7 @@ pub async fn handle_connection(
                         .current_match
                         .unwrap();
 
-                    println!("\n\nstep: {:?}", step);
+                    println!("\n\nstep: {:?}\n", step);
 
                     {
                         info!("updating board state in match: {}", &match_id);
@@ -253,7 +253,13 @@ pub async fn handle_connection(
                                 &matches.get(&match_id).unwrap().board_state,
                                 &step,
                             );
+
+                        info!(
+                            "board after engine fn: {}",
+                            matches.get_mut(&match_id).unwrap().board_state.clone()
+                        );
                     }
+
                     let message = ServerMessage2::UIUpdate {
                         fen: matches
                             .lock()

ui/src/main.rs

@@ -276,8 +276,10 @@ impl ChessApp {
                             if let Ok(mut state) = game_state_clone.lock() {
                                 match &server_msg {
                                     ServerMessage2::UIUpdate { fen, turn_player } => {
+                                        info!("raw fen: {}", &fen);
                                         state.fen = fen.clone();
                                         state.turn_player = Some(turn_player.clone());
+                                        warn!("turn player: {}", &state.turn_player.clone().unwrap());
                                     }
                                     ServerMessage2::MatchFound {
                                         color,
@@ -503,6 +505,9 @@ impl ChessApp {
                         }
                     }
                     ServerMessage2::UIUpdate { fen, turn_player } => {
+                        if let Some(tx) = &self.tx_to_network {
+                            let _ = tx.send(ClientEvent::RequestLegalMoves {fen: self.game_state.lock().unwrap().fen.clone()});
+                        }
                         info!("Board updated with FEN: {}", fen);
                     }
                     _ => {}
@@ -987,21 +992,7 @@ impl eframe::App for ChessApp {
                                             if rect.contains(click_pos) {
                                                 let res = self.handle_click(display_row, display_col);
                                                 match res {
-                                                Ok(_) => {
+                                                    Ok(_) => {}
-                                                    if let Some(tx) = &self.tx_to_network {
-                                                        info!("requesting legal moves from server");
-                                                        let _ = tx.send(
-                                                            ClientEvent::RequestLegalMoves {
-                                                                fen: self
-                                                                    .game_state
-                                                                    .lock()
-                                                                    .unwrap()
-                                                                    .fen
-                                                                    .clone(),
-                                                            },
-                                                        );
-                                                    };
-                                                }
                                                     Err(e) => {
                                                         error!("{}", e);
                                                     }