aboutsummaryrefslogtreecommitdiff
path: root/planetwars-server/src/routes
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-06-10 21:49:32 +0200
committerIlion Beyst <ilion.beyst@gmail.com>2022-06-10 21:49:32 +0200
commita3766980735851e9aa4b56a80e91c0b77cf63adb (patch)
tree0d8e6d077b0cd87809a3b7d9d2e113efc88524ee /planetwars-server/src/routes
parent5ee66c9c9b4156692c739a861c9cdbaf0c65aec8 (diff)
downloadplanetwars.dev-a3766980735851e9aa4b56a80e91c0b77cf63adb.tar.xz
planetwars.dev-a3766980735851e9aa4b56a80e91c0b77cf63adb.zip
update RunMatch helper to allow for remote bots
Diffstat (limited to 'planetwars-server/src/routes')
-rw-r--r--planetwars-server/src/routes/demo.rs7
-rw-r--r--planetwars-server/src/routes/matches.rs2
2 files changed, 6 insertions, 3 deletions
diff --git a/planetwars-server/src/routes/demo.rs b/planetwars-server/src/routes/demo.rs
index 3318dfd..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");
diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs
index 7169ebe..874c775 100644
--- a/planetwars-server/src/routes/matches.rs
+++ b/planetwars-server/src/routes/matches.rs
@@ -61,7 +61,7 @@ pub async fn play_match(
});
bot_ids.push(matches::MatchPlayerData {
- code_bundle_id: code_bundle.id,
+ code_bundle_id: Some(code_bundle.id),
});
}