Fix test compilation after last commit.

Author: daboross

Diff for: src/websocket/types/room/objects/container.rs

@@ -84,8 +84,9 @@ mod test {
                 x: 19,
                 y: 22,
                 ref id,
+                ref store,
                 ..
-            } if id == "58cc8143050a8f701678f22e" && store == store! {energy: 2000} => (),
+            } if id == "58cc8143050a8f701678f22e" && *store == store! {Energy: 2000} => (),
             other => panic!(
                 "expected pre-set StructureContainer to match, found {:#?}",
                 other

Diff for: src/websocket/types/room/objects/creep.rs

@@ -180,7 +180,7 @@ mod test {
 
     use crate::data::RoomName;
 
-    use super::{Creep, CreepActions, CreepPartType};
+    use super::{ActionLogTarget, Creep, CreepActions, CreepPartType};
 
     #[test]
     fn parse_creep() {
@@ -269,7 +269,7 @@ mod test {
                         repair: None,
                         reserve_controller: None,
                         say: None,
-                        upgrade_controller: ActionLogTarget { x: 27, y: 8 },
+                        upgrade_controller: Some(ActionLogTarget { x: 27, y: 8 }),
                     },
                 ref body,
                 ref user,

Diff for: src/websocket/types/room/objects/storage.rs

@@ -88,21 +88,19 @@ mod test {
 
         match obj {
             StructureStorage {
-                ghodium_oxide: 0,
-                keanium_oxide: 0,
-                oxygen: 0,
-                utrium: 33581,
-                catalyzed_ghodium_alkalide: 5400,
-                keanium: 0,
-                energy: 631112,
                 capacity: 1000000,
                 hits: 10000,
                 hits_max: 10000,
                 notify_when_attacked: true,
                 x: 7,
                 y: 16,
+                ref store,
                 ..
-            } => (),
+            } if *store
+                == store! { Energy: 631112, Utrium: 33581, CatalyzedGhodiumAlkalide: 5400 } =>
+            {
+                ()
+            }
             other => panic!(
                 "expected pre-set StructureStorage to match, found {:#?}",
                 other

Diff for: src/websocket/types/room/objects/terminal.rs

@@ -104,7 +104,7 @@ mod test {
                 ..
             } if user == "57874d42d0ae911e3bd15bbc"
                 && id == "59675fbfb554456b195342e7"
-                && store == store! {energy: 1321} =>
+                && *store == store! {Energy: 1321} =>
             {
                 ()
             }

Diff for: src/websocket/types/room/objects/tombstone.rs

@@ -49,7 +49,7 @@ impl Tombstone {
 mod test {
     use serde::Deserialize;
 
-    use super::Tombstone;
+    use super::{ResourceType, Tombstone};
 
     #[test]
     fn parse_simple_tombstone() {
@@ -119,6 +119,6 @@ mod test {
 
         assert_eq!(obj.creep_id, "5ce098c5c4e055067fbf182e");
         assert_eq!(obj.creep_name, "6922398-0");
-        assert_eq!(obj.energy, 44);
+        assert_eq!(obj.store.get(ResourceType::Energy), 44);
     }
 }

Diff for: src/websocket/types/room/resources.rs

@@ -262,7 +262,7 @@ macro_rules! store {
             let mut store = crate::websocket::types::room::resources::Store::default();
 
             $(
-                store.0.insert(stringify!($name).to_owned(), $val);
+                store.0.insert(crate::websocket::types::room::resources::ResourceType::$name, $val);
             )*
 
             store