From a0ad26d634c940de33eb40d55bcd55ae7f456104 Mon Sep 17 00:00:00 2001 From: Paris DOUADY Date: Wed, 4 Oct 2023 11:43:46 +0200 Subject: [PATCH] fix tests --- simulation/src/economy/market.rs | 5 +++-- simulation/src/souls/freight_station.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/simulation/src/economy/market.rs b/simulation/src/economy/market.rs index 1f7865da..a5a80c7a 100644 --- a/simulation/src/economy/market.rs +++ b/simulation/src/economy/market.rs @@ -439,9 +439,10 @@ fn calculate_prices( mod tests { use super::Market; use crate::economy::{ItemRegistry, WORKER_CONSUMPTION_PER_SECOND}; - use crate::souls::goods_company::{CompanyKind, GoodsCompanyDescription, Recipe}; + use crate::souls::goods_company::{GoodsCompanyDescription, Recipe}; use crate::world::CompanyID; - use crate::{map::BuildingGen, GoodsCompanyRegistry, SoulID}; + use crate::{GoodsCompanyRegistry, SoulID}; + use common::descriptions::{BuildingGen, CompanyKind}; use geom::{vec2, Vec2}; fn mk_ent(id: u64) -> CompanyID { diff --git a/simulation/src/souls/freight_station.rs b/simulation/src/souls/freight_station.rs index 672d27f4..96fd43a7 100644 --- a/simulation/src/souls/freight_station.rs +++ b/simulation/src/souls/freight_station.rs @@ -163,11 +163,11 @@ pub fn freight_station_system(world: &mut World, resources: &mut Resources) { #[cfg(test)] mod tests { - use crate::map::BuildingGen; use crate::map_dynamic::BuildingInfos; use crate::souls::human::{spawn_human, HumanDecisionKind}; use crate::tests::TestCtx; use crate::{BuildingKind, SoulID, WorldCommand}; + use common::descriptions::BuildingGen; use geom::{vec2, vec3, OBB}; #[test]