fix: more unit tests, get rid of asdictionary

WalletConnect · Sep 10, 2023 · 79211ad · 79211ad
1 parent d933f98
commit 79211ad
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 44 deletions.
diff --git a/Core Modules/WalletConnectSharp.Common/Model/Errors/SdkErrors.cs b/Core Modules/WalletConnectSharp.Common/Model/Errors/SdkErrors.cs
@@ -27,9 +27,9 @@ public static class SdkErrors
         /// <param name="type">The error type message to generate</param>
         /// <param name="params">A dictionary (or anonymous type) of parameters for the error message</param>
         /// <returns>The error message as a string</returns>
-        public static string MessageFromType(ErrorType type, object @params = null)
+        public static string MessageFromType(ErrorType type, Dictionary<string, object> @params = null)
         {
-            return MessageFromType(type, null, @params.AsDictionary());
+            return MessageFromType(type, null, @params);
         }
 
         /// <summary>
@@ -47,8 +47,8 @@ public static string MessageFromType(ErrorType type, string message = null, Dict
                 @params = new Dictionary<string, object>();
             }
 
-            if (!string.IsNullOrWhiteSpace(message) && !@params.ContainsKey("message"))
-                @params.Add("message", message);
+            if (!string.IsNullOrWhiteSpace(message))
+                @params.TryAdd("message", message);
 
             string errorMessage;
             switch (type)
@@ -231,4 +231,4 @@ private static string FormatErrorText(string formattedText, Dictionary<string, o
             return text;
         }
     }
-}
+}
diff --git a/Core Modules/WalletConnectSharp.Common/Model/Errors/WalletConnectException.cs b/Core Modules/WalletConnectSharp.Common/Model/Errors/WalletConnectException.cs
@@ -84,9 +84,9 @@ public static WalletConnectException FromType(ErrorType type, string message = n
         /// <param name="type">The error type of the exception</param>
         /// <param name="params">Additional (optional) parameters for the generated error message</param>
         /// <returns>A new exception</returns>
-        public static WalletConnectException FromType(ErrorType type, object @params = null)
+        public static WalletConnectException FromType(ErrorType type, Dictionary<string, object> @params = null)
         {
-            return FromType(type, null, @params.AsDictionary());
+            return FromType(type, null, @params);
         }
     }
-}
+}
diff --git a/Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs b/Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs
@@ -11,34 +11,6 @@ namespace WalletConnectSharp.Common.Utils
     /// </summary>
     public static class Extensions
     {
-        /// <summary>
-        /// Convert an anonymous type to a Dictionary
-        /// </summary>
-        /// <param name="obj">The anonymous type instance to convert to a dictionary</param>
-        /// <param name="enforceLowercase">Enforce all keys to be lowercased</param>
-        /// <returns>A dictionary where each key is the property name of the anonymous type
-        /// and each value is the property's value</returns>
-        public static Dictionary<string, object> AsDictionary(this object obj, bool enforceLowercase = true)
-        {
-            if (obj is Dictionary<string, object> objects)
-                return objects;
-
-            var dict = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-
-            if (obj != null)
-            {
-                foreach (PropertyInfo propertyDescriptor in obj.GetType().GetProperties())
-                {
-                    object value = propertyDescriptor.GetValue(obj, null);
-                    var key = enforceLowercase ? propertyDescriptor.Name.ToLower() : propertyDescriptor.Name;
-
-                    dict.Add(key, value);
-                }
-            }
-
-            return dict;
-        }
-
         /// <summary>
         /// Returns true if the given object is a numeric type
         /// </summary>

diff --git a/Core Modules/WalletConnectSharp.Crypto/Crypto.cs b/Core Modules/WalletConnectSharp.Crypto/Crypto.cs
@@ -578,7 +578,10 @@ private void IsInitialized()
         {
             if (!this._initialized)
             {
-                throw WalletConnectException.FromType(ErrorType.NOT_INITIALIZED, new {Name});
+                throw WalletConnectException.FromType(ErrorType.NOT_INITIALIZED, new Dictionary<string, object>()
+                {
+                    { "Name", Name }
+                });
             }
         }
 

diff --git a/Core Modules/WalletConnectSharp.Crypto/KeyChain.cs b/Core Modules/WalletConnectSharp.Crypto/KeyChain.cs
@@ -142,7 +142,10 @@ public async Task<string> Get(string tag)
 
             if (!await Has(tag))
             {
-                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new {tag});
+                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new Dictionary<string, object>()
+                {
+                    {"tag", tag}
+                });
             }
 
             return this._keyChain[tag];
@@ -160,7 +163,10 @@ public async Task Delete(string tag)
 
             if (!await Has(tag))
             {
-                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new {tag});
+                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new Dictionary<string, object>()
+                {
+                    {"tag", tag}
+                });
             }
 
             _keyChain.Remove(tag);
@@ -172,7 +178,10 @@ private void IsInitialized()
         {
             if (!this._initialized)
             {
-                throw WalletConnectException.FromType(ErrorType.NOT_INITIALIZED, new {Name});
+                throw WalletConnectException.FromType(ErrorType.NOT_INITIALIZED, new Dictionary<string, object>()
+                {
+                    {"Name", Name}
+                });
             }
         }
 

diff --git a/Core Modules/WalletConnectSharp.Network/Models/Error.cs b/Core Modules/WalletConnectSharp.Network/Models/Error.cs
@@ -28,6 +28,17 @@ public class Error
         /// </summary>
         [JsonProperty("data")]
         public string Data;
+
+        /// <summary>
+        /// Create an ErrorResponse with a given ErrorType and (optional) parameters
+        /// </summary>
+        /// <param name="type">The error type of the ErrorResponse to create</param>
+        /// <param name="message">The message to attach to the error</param>
+        /// <returns>A new ErrorResponse</returns>
+        public static Error FromErrorType(ErrorType type, string message)
+        {
+            return FromErrorType(type, new Dictionary<string, object>() { { "message", message } });
+        }
 
         /// <summary>
         /// Create an ErrorResponse with a given ErrorType and (optional) parameters
@@ -36,7 +47,7 @@ public class Error
         /// <param name="params">Extra parameters for the error message</param>
         /// <param name="extraData">Extra data that is stored in the Data field of the newly created ErrorResponse</param>
         /// <returns>A new ErrorResponse</returns>
-        public static Error FromErrorType(ErrorType type, object @params = null, string extraData = null)
+        public static Error FromErrorType(ErrorType type, Dictionary<string, object> @params = null, string extraData = null)
         {
             string message = SdkErrors.MessageFromType(type, @params);
 

diff --git a/WalletConnectSharp.Auth/Controllers/AuthEngine.cs b/WalletConnectSharp.Auth/Controllers/AuthEngine.cs
@@ -280,9 +280,9 @@ private async Task OnAuthResponse(string topic, JsonRpcResponse<Cacao> response)
             {
                 this.Client.OnAuthResponse(new AuthErrorResponse()
                 {
-                    Id = id, Topic = topic, Error = Error.FromErrorType(ErrorType.GENERIC, new
+                    Id = id, Topic = topic, Error = Error.FromErrorType(ErrorType.GENERIC, new Dictionary<string, object>()
                     {
-                        Message = "Invalid signature"
+                        {"Message", "Invalid signature"}
                     })
                 });
             }

diff --git a/WalletConnectSharp.Core/Controllers/JsonRpcHistory.cs b/WalletConnectSharp.Core/Controllers/JsonRpcHistory.cs
@@ -272,7 +272,10 @@ private JsonRpcRecord<T, TR> GetRecord(long id)
 
             if (!_records.ContainsKey(id))
             {
-                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new {Tag = $"{Name}: {id}"});
+                throw WalletConnectException.FromType(ErrorType.NO_MATCHING_KEY, new Dictionary<string, object>()
+                {
+                    {"Tag", $"{Name}: {id}"}
+                });
             }
 
             return _records[id];