diff options
| author | Ilion Beyst <ilion.beyst@gmail.com> | 2022-07-04 20:16:42 +0200 |
|---|---|---|
| committer | Ilion Beyst <ilion.beyst@gmail.com> | 2022-07-04 20:16:42 +0200 |
| commit | 268e080ec1b11e75309c3b134e16cf6ea7004ac6 (patch) | |
| tree | 6cf54c91b4575494f1f2c2feb7790aadae817eb7 /planetwars-server/src/routes/demo.rs | |
| parent | bbed87755419f97b0ee8967617af0c6573c168af (diff) | |
| parent | 7a3b801f58752a78b65e3e7e7b998b6479f980f7 (diff) | |
| download | planetwars.dev-268e080ec1b11e75309c3b134e16cf6ea7004ac6.tar.xz planetwars.dev-268e080ec1b11e75309c3b134e16cf6ea7004ac6.zip | |
Merge branch 'bot-api' into next
Diffstat (limited to 'planetwars-server/src/routes/demo.rs')
| -rw-r--r-- | planetwars-server/src/routes/demo.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/planetwars-server/src/routes/demo.rs b/planetwars-server/src/routes/demo.rs index 7f7ba71..33dc02d 100644 --- a/planetwars-server/src/routes/demo.rs +++ b/planetwars-server/src/routes/demo.rs @@ -1,7 +1,7 @@ use crate::db; use crate::db::matches::{FullMatchData, FullMatchPlayerData}; use crate::modules::bots::save_code_bundle; -use crate::modules::matches::RunMatch; +use crate::modules::matches::{MatchPlayer, RunMatch}; use crate::ConnectionPool; use axum::extract::Extension; use axum::Json; @@ -46,7 +46,10 @@ pub async fn submit_bot( // TODO: can we recover from this? .expect("could not save bot code"); - let mut run_match = RunMatch::from_players(vec![&player_code_bundle, &opponent_code_bundle]); + let mut run_match = RunMatch::from_players(vec![ + MatchPlayer::from_code_bundle(&player_code_bundle), + MatchPlayer::from_code_bundle(&opponent_code_bundle), + ]); let match_data = run_match .store_in_database(&conn) .expect("failed to save match"); @@ -58,12 +61,12 @@ pub async fn submit_bot( match_players: vec![ FullMatchPlayerData { base: match_data.match_players[0].clone(), - code_bundle: player_code_bundle, + code_bundle: Some(player_code_bundle), bot: None, }, FullMatchPlayerData { base: match_data.match_players[1].clone(), - code_bundle: opponent_code_bundle, + code_bundle: Some(opponent_code_bundle), bot: Some(opponent), }, ], |