From e65c030472b48f42e4be7945bf998a5b0dd07b53 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Thu, 27 Apr 2023 10:29:41 +0200
Subject: [PATCH] Use more appropriate object type for validation

---
 crates/fj-kernel/src/objects/object.rs      | 18 +++++++++---------
 crates/fj-kernel/src/services/mod.rs        |  2 +-
 crates/fj-kernel/src/services/validation.rs |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crates/fj-kernel/src/objects/object.rs b/crates/fj-kernel/src/objects/object.rs
index 22c9d16f2..a53840009 100644
--- a/crates/fj-kernel/src/objects/object.rs
+++ b/crates/fj-kernel/src/objects/object.rs
@@ -31,6 +31,15 @@ macro_rules! object {
                     )*
                 }
             }
+
+            /// Validate the object
+            pub fn validate(&self, errors: &mut Vec<ValidationError>) {
+                match self {
+                    $(
+                        Self::$ty(object) => object.validate(errors),
+                    )*
+                }
+            }
         }
 
         impl Object<WithHandle> {
@@ -47,15 +56,6 @@ macro_rules! object {
                     )*
                 }
             }
-
-            /// Validate the object
-            pub fn validate(&self, errors: &mut Vec<ValidationError>) {
-                match self {
-                    $(
-                        Self::$ty((_, object)) => object.validate(errors),
-                    )*
-                }
-            }
         }
 
         impl From<Object<WithHandle>> for Object<BehindHandle> {
diff --git a/crates/fj-kernel/src/services/mod.rs b/crates/fj-kernel/src/services/mod.rs
index fda586850..547a80137 100644
--- a/crates/fj-kernel/src/services/mod.rs
+++ b/crates/fj-kernel/src/services/mod.rs
@@ -47,7 +47,7 @@ impl Services {
 
         for object_event in object_events {
             let command = ValidationCommand::ValidateObject {
-                object: object_event.object,
+                object: object_event.object.into(),
             };
             self.validation.execute(command, &mut Vec::new());
         }
diff --git a/crates/fj-kernel/src/services/validation.rs b/crates/fj-kernel/src/services/validation.rs
index 90cff079f..7eb3cdd9e 100644
--- a/crates/fj-kernel/src/services/validation.rs
+++ b/crates/fj-kernel/src/services/validation.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, thread};
 
 use crate::{
-    objects::{BehindHandle, Object, WithHandle},
+    objects::{BehindHandle, Object},
     storage::ObjectId,
     validate::ValidationError,
 };
@@ -44,7 +44,7 @@ impl State for Validation {
 
         for err in errors {
             events.push(ValidationFailed {
-                object: object.clone().into(),
+                object: object.clone(),
                 err,
             });
         }
@@ -60,7 +60,7 @@ pub enum ValidationCommand {
     /// Validate the provided object
     ValidateObject {
         /// The object to validate
-        object: Object<WithHandle>,
+        object: Object<BehindHandle>,
     },
 }