From a26a7055aae0025f88e5aa0d5742d323ffef436f Mon Sep 17 00:00:00 2001
From: Rutherther <fandabohacek@gmail.com>
Date: Tue, 14 Feb 2023 23:41:48 +0100
Subject: [PATCH] feat(binding): use Result instead of IResult

---
 src/Core/NosSmooth.LocalBinding/Hooks/IHookManager.cs |  2 +-
 .../Hooks/Implementations/HookManager.cs              | 11 +++++------
 src/Core/NosSmooth.LocalBinding/NosBrowserManager.cs  |  4 ++--
 .../Hooks/SharedHookManager.cs                        |  4 ++--
 .../Hooks/SingleHookManager.cs                        |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Core/NosSmooth.LocalBinding/Hooks/IHookManager.cs b/src/Core/NosSmooth.LocalBinding/Hooks/IHookManager.cs
index 78239c3..61e58a5 100644
--- a/src/Core/NosSmooth.LocalBinding/Hooks/IHookManager.cs
+++ b/src/Core/NosSmooth.LocalBinding/Hooks/IHookManager.cs
@@ -108,7 +108,7 @@ public interface IHookManager
     /// <param name="bindingManager">The binding manager.</param>
     /// <param name="browserManager">The browser manager.</param>
     /// <returns>A result that may or may not have failed.</returns>
-    public IResult Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager);
+    public Result Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager);
 
     /// <summary>
     /// Enable hooks from the given list.
diff --git a/src/Core/NosSmooth.LocalBinding/Hooks/Implementations/HookManager.cs b/src/Core/NosSmooth.LocalBinding/Hooks/Implementations/HookManager.cs
index 192c5fc..68372b7 100644
--- a/src/Core/NosSmooth.LocalBinding/Hooks/Implementations/HookManager.cs
+++ b/src/Core/NosSmooth.LocalBinding/Hooks/Implementations/HookManager.cs
@@ -57,7 +57,7 @@ internal class HookManager : IHookManager
     public IReadOnlyList<INostaleHook> Hooks => _hooks.Values.ToList();
 
     /// <inheritdoc/>
-    public IResult Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager)
+    public Result Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager)
     {
         _initialized = true;
         if (_hooks.Count > 0)
@@ -84,7 +84,7 @@ internal class HookManager : IHookManager
         return original;
     }
 
-    private IResult HandleResults(params Func<Result<INostaleHook>>[] functions)
+    private Result HandleResults(params Func<Result<INostaleHook>>[] functions)
     {
         List<IResult> errorResults = new List<IResult>();
         foreach (var func in functions)
@@ -98,21 +98,20 @@ internal class HookManager : IHookManager
                 }
                 else
                 {
-                    errorResults.Add(result);
+                    errorResults.Add(Result.FromError(result));
                 }
             }
             catch (Exception e)
             {
                 errorResults.Add((Result)e);
             }
-
         }
 
         return errorResults.Count switch
         {
             0 => Result.FromSuccess(),
-            1 => errorResults[0],
-            _ => (Result)new AggregateError(errorResults)
+            1 => (Result)errorResults[0],
+            _ => new AggregateError(errorResults)
         };
     }
 
diff --git a/src/Core/NosSmooth.LocalBinding/NosBrowserManager.cs b/src/Core/NosSmooth.LocalBinding/NosBrowserManager.cs
index 1a7c9be..3dcc5a4 100644
--- a/src/Core/NosSmooth.LocalBinding/NosBrowserManager.cs
+++ b/src/Core/NosSmooth.LocalBinding/NosBrowserManager.cs
@@ -196,11 +196,11 @@ public class NosBrowserManager
     /// Needed to use all of the classes from NosTale.
     /// </remarks>
     /// <returns>A result that may or may not have succeeded.</returns>
-    public IResult Initialize()
+    public Result Initialize()
     {
         if (!IsNostaleProcess)
         {
-            return (Result)new NotNostaleProcessError(Process);
+            return new NotNostaleProcessError(Process);
         }
 
         NostaleObject Map<T>(T val)
diff --git a/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SharedHookManager.cs b/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SharedHookManager.cs
index 7afa35e..d300b00 100644
--- a/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SharedHookManager.cs
+++ b/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SharedHookManager.cs
@@ -42,10 +42,10 @@ public class SharedHookManager
     /// <param name="browserManager">The browser manager.</param>
     /// <param name="options">The initial options to be respected.</param>
     /// <returns>The dictionary containing all of the hooks.</returns>
-    public (Dictionary<string, INostaleHook>, IResult) InitializeInstance
+    public (Dictionary<string, INostaleHook>, Result) InitializeInstance
         (NosBindingManager bindingManager, NosBrowserManager browserManager, HookManagerOptions options)
     {
-        IResult result = Result.FromSuccess();
+        Result result = Result.FromSuccess();
         if (!_initialized)
         {
             result = _underlyingManager.Initialize(bindingManager, browserManager);
diff --git a/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SingleHookManager.cs b/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SingleHookManager.cs
index 5c46417..6e9f8b9 100644
--- a/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SingleHookManager.cs
+++ b/src/Extensions/NosSmooth.Extensions.SharedBinding/Hooks/SingleHookManager.cs
@@ -62,7 +62,7 @@ public class SingleHookManager : IHookManager
     public IReadOnlyList<INostaleHook> Hooks => _hooks.Values.ToList();
 
     /// <inheritdoc />
-    public IResult Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager)
+    public Result Initialize(NosBindingManager bindingManager, NosBrowserManager browserManager)
     {
         _initialized = true;
         var (hooks, result) = _sharedHookManager.InitializeInstance(bindingManager, browserManager, _options);
-- 
2.48.1