Skip to content

refactor check_puzzle into check_solution #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ma2bd merged 1 commit into from
Sep 17, 2025
Merged

refactor check_puzzle into check_solution #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/src/bin/gol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ fn create_puzzles(output_dir: &PathBuf) -> Result<(), Box<dyn std::error::Error>
println!("{puzzle:#}");
println!("Created solution: {}", solution_path.display());
println!("{solution:#}");
let steps = solution.check_puzzle(&puzzle)?;
let steps = puzzle.check_solution(&solution)?;
println!("Verified solution: {steps} steps");
println!();
}
Expand Down Expand Up @@ -711,7 +711,7 @@ fn check_solution(
let board: Board = bcs::from_bytes(&board_bytes)?;

// Check if board solves the puzzle
match board.check_puzzle(&puzzle) {
match puzzle.check_solution(&board) {
Ok(steps) => {
println!("✅ Solution is VALID!");
println!(" Initial board passes all initial conditions");
Expand Down
6 changes: 3 additions & 3 deletions backend/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
mod state;

use async_graphql::ComplexObject;
use gol_challenge::{GolChallengeAbi, Operation};
use gol_challenge::{game::Puzzle, GolChallengeAbi, Operation};
use linera_sdk::{
linera_base_types::{AccountOwner, ChainId, DataBlobHash, Timestamp, WithContractAbi},
views::{RootView, View},
Expand Down Expand Up @@ -75,8 +75,8 @@ impl Contract for GolChallengeContract {
.expect("Operation must have an owner or be authenticated.")
});
let puzzle_bytes = self.runtime.read_data_blob(puzzle_id);
let puzzle = bcs::from_bytes(&puzzle_bytes).expect("Deserialize puzzle");
board.check_puzzle(&puzzle).expect("Invalid solution");
let puzzle = bcs::from_bytes::<Puzzle>(&puzzle_bytes).expect("Deserialize puzzle");
puzzle.check_solution(&board).expect("Invalid solution");
let timestamp = self.runtime.system_time();
let solution = Solution {
board,
Expand Down
66 changes: 33 additions & 33 deletions backend/src/game.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,71 +823,71 @@ impl Board {

conditions
}
}

impl Puzzle {
/// Check that the board satisfies the given puzzle.
pub fn check_puzzle(&self, puzzle: &Puzzle) -> Result<u16, InvalidSolution> {
if puzzle.minimal_steps > puzzle.maximal_steps {
pub fn check_solution(&self, board: &Board) -> Result<u16, InvalidSolution> {
if self.minimal_steps > self.maximal_steps {
return Err(InvalidSolution::InvalidStepRange {
min_steps: puzzle.minimal_steps,
max_steps: puzzle.maximal_steps,
min_steps: self.minimal_steps,
max_steps: self.maximal_steps,
});
}
if self.size != puzzle.size {
if board.size != self.size {
return Err(InvalidSolution::SizeMismatch {
board_size: self.size,
puzzle_size: puzzle.size,
board_size: board.size,
puzzle_size: self.size,
});
}
if let Err((condition_index, reason)) = self.check_conditions(&puzzle.initial_conditions) {
if let Err((condition_index, reason)) = board.check_conditions(&self.initial_conditions) {
return Err(InvalidSolution::InitialConditionFailed {
condition_index,
reason,
});
}
if puzzle.is_strict {
if puzzle.minimal_steps == 0 {
if self.is_strict {
if self.minimal_steps == 0 {
return Err(InvalidSolution::InvalidStepRange {
min_steps: puzzle.minimal_steps,
max_steps: puzzle.maximal_steps,
min_steps: self.minimal_steps,
max_steps: self.maximal_steps,
});
}
let board = self.advance(puzzle.minimal_steps - 1);
let board = board.advance(self.minimal_steps - 1);
match board.advance_until(
&puzzle.final_conditions,
puzzle.maximal_steps - puzzle.minimal_steps + 1,
&self.final_conditions,
self.maximal_steps - self.minimal_steps + 1,
) {
Ok((steps, _)) => {
if steps == 0 {
return Err(InvalidSolution::FinalConditionsMustFailAt {
steps: puzzle.minimal_steps - 1,
steps: self.minimal_steps - 1,
});
}
Ok(puzzle.minimal_steps - 1 + steps)
Ok(self.minimal_steps - 1 + steps)
}
Err((condition_index, reason)) => Err(InvalidSolution::FinalConditionFailed {
condition_index,
steps: puzzle.maximal_steps,
steps: self.maximal_steps,
reason,
}),
}
} else {
let board = self.advance(puzzle.minimal_steps);
let board = board.advance(self.minimal_steps);
match board.advance_until(
&puzzle.final_conditions,
puzzle.maximal_steps - puzzle.minimal_steps,
&self.final_conditions,
self.maximal_steps - self.minimal_steps,
) {
Ok((steps, _)) => Ok(puzzle.minimal_steps + steps),
Ok((steps, _)) => Ok(self.minimal_steps + steps),
Err((condition_index, reason)) => Err(InvalidSolution::FinalConditionFailed {
condition_index,
steps: puzzle.maximal_steps,
steps: self.maximal_steps,
reason,
}),
}
}
}
}

impl Puzzle {
/// Convert this puzzle to a DirectPuzzle representation for display.
pub fn to_direct_puzzle(&self) -> DirectPuzzle {
let mut initial_constraints =
Expand Down Expand Up @@ -1265,7 +1265,7 @@ mod tests {
};

assert_eq!(
board.check_puzzle(&puzzle),
puzzle.check_solution(&board),
Err(InvalidSolution::SizeMismatch {
board_size: 5,
puzzle_size: 10
Expand All @@ -1289,7 +1289,7 @@ mod tests {
};

assert_eq!(
board.check_puzzle(&puzzle),
puzzle.check_solution(&board),
Err(InvalidSolution::InvalidStepRange {
min_steps: 6,
max_steps: 4
Expand All @@ -1316,7 +1316,7 @@ mod tests {
};

assert_eq!(
board.check_puzzle(&puzzle),
puzzle.check_solution(&board),
Err(InvalidSolution::InitialConditionFailed {
condition_index: 0,
reason: ConditionFailureReason::PositionMismatch {
Expand Down Expand Up @@ -1378,7 +1378,7 @@ mod tests {
};

// Test that after 2 steps (full blinker cycle), we get back to the initial pattern.
assert_eq!(board.check_puzzle(&puzzle), Ok(2));
assert_eq!(puzzle.check_solution(&board), Ok(2));
}

#[test]
Expand Down Expand Up @@ -1450,7 +1450,7 @@ mod tests {
],
};

assert_eq!(board.check_puzzle(&puzzle), Ok(31));
assert_eq!(puzzle.check_solution(&board), Ok(31));
}

#[test]
Expand Down Expand Up @@ -1522,7 +1522,7 @@ mod tests {
};

assert_eq!(
board.check_puzzle(&puzzle),
puzzle.check_solution(&board),
Err(InvalidSolution::FinalConditionFailed {
condition_index: 0,
steps: 1,
Expand Down Expand Up @@ -1577,7 +1577,7 @@ mod tests {
};

// Test initial condition failure with detailed information.
match board.check_puzzle(&puzzle) {
match puzzle.check_solution(&board) {
Err(InvalidSolution::InitialConditionFailed {
condition_index,
reason,
Expand Down Expand Up @@ -1628,7 +1628,7 @@ mod tests {
final_conditions: vec![],
};

match board2.check_puzzle(&puzzle2) {
match puzzle2.check_solution(&board2) {
Err(InvalidSolution::InitialConditionFailed {
condition_index,
reason,
Expand Down
5 changes: 3 additions & 2 deletions backend/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ impl GolChallengeState {
.data::<Arc<ServiceRuntime<GolChallengeService>>>()
.unwrap();
let puzzle_bytes = runtime.read_data_blob(puzzle_id);
let puzzle = bcs::from_bytes(&puzzle_bytes).expect("Failed to deserialize puzzle");
let puzzle =
bcs::from_bytes::<Puzzle>(&puzzle_bytes).expect("Failed to deserialize puzzle");

match board.check_puzzle(&puzzle) {
match puzzle.check_solution(&board) {
Ok(steps) => ValidationResult {
is_valid_after_steps: Some(steps),
error_message: None,
Expand Down