From 273949369f483a0116bf717d8735f84f510cedf3 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Thu, 20 Oct 2022 18:19:33 -0400
Subject: [PATCH] Fix unit tests

---
 common/src/bin/skill_graphviz.rs                     | 2 +-
 common/src/states/utils.rs                           | 1 -
 voxygen/src/audio/sfx/event_mapper/combat/tests.rs   | 5 +++--
 voxygen/src/audio/sfx/event_mapper/movement/tests.rs | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/src/bin/skill_graphviz.rs b/common/src/bin/skill_graphviz.rs
index 84f909f88a..0753e24903 100644
--- a/common/src/bin/skill_graphviz.rs
+++ b/common/src/bin/skill_graphviz.rs
@@ -36,7 +36,7 @@ fn main() {
     };
     for skill in skills {
         let prerequisites = SKILL_PREREQUISITES
-            .get(&skill)
+            .get(skill)
             .map_or(Vec::new(), |p| p.iter().collect::<Vec<_>>());
 
         let out_node = add_node(&mut graph, *skill);
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index b615966075..edff508657 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -1288,7 +1288,6 @@ impl MovementDirection {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct AbilityInfo {
     pub tool: Option<ToolKind>,
     pub hand: Option<HandInfo>,
diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
index e955385a76..00d7646ea4 100644
--- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
@@ -4,7 +4,7 @@ use common::{
     combat::DamageKind,
     comp::{
         inventory::loadout_builder::LoadoutBuilder, item::tool::ToolKind, melee,
-        CharacterAbilityType, CharacterState, InputKind, Item,
+        CharacterAbilityType, CharacterState, Item,
     },
     states,
 };
@@ -238,9 +238,10 @@ fn empty_ability_info() -> states::utils::AbilityInfo {
     states::utils::AbilityInfo {
         tool: None,
         hand: None,
-        input: InputKind::Primary,
+        input: None,
         input_attr: None,
         ability_meta: Default::default(),
         ability: None,
+        return_ability: None,
     }
 }
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
index 0cb63c3f6a..cec030bfb8 100644
--- a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
@@ -2,8 +2,8 @@ use super::*;
 use crate::audio::sfx::SfxEvent;
 use common::{
     comp::{
-        bird_large, humanoid, quadruped_medium, quadruped_small, Body, CharacterState, InputKind,
-        Ori, PhysicsState,
+        bird_large, humanoid, quadruped_medium, quadruped_small, Body, CharacterState, Ori,
+        PhysicsState,
     },
     states,
     terrain::{Block, BlockKind},
@@ -291,9 +291,10 @@ fn empty_ability_info() -> states::utils::AbilityInfo {
     states::utils::AbilityInfo {
         tool: None,
         hand: None,
-        input: InputKind::Primary,
+        input: None,
         input_attr: None,
         ability_meta: Default::default(),
         ability: None,
+        return_ability: None,
     }
 }