Removing bad ToOptionalObject helper

BoomDAO · Feb 6, 2023 · 806173b · 806173b
1 parent a1f1131
commit 806173b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 57 deletions.
diff --git a/src/Candid/API.md b/src/Candid/API.md
@@ -300,7 +300,6 @@
   - [Reserved()](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-Reserved 'EdjCase.ICP.Candid.Models.CandidTypedValue.Reserved')
   - [Text(value)](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-Text-System-String- 'EdjCase.ICP.Candid.Models.CandidTypedValue.Text(System.String)')
   - [ToObject\`\`1(converter)](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-ToObject``1-EdjCase-ICP-Candid-CandidConverter- 'EdjCase.ICP.Candid.Models.CandidTypedValue.ToObject``1(EdjCase.ICP.Candid.CandidConverter)')
-  - [ToOptionalObject\`\`1(converter)](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-ToOptionalObject``1-EdjCase-ICP-Candid-CandidConverter- 'EdjCase.ICP.Candid.Models.CandidTypedValue.ToOptionalObject``1(EdjCase.ICP.Candid.CandidConverter)')
   - [Vector(innerType,values)](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-Vector-EdjCase-ICP-Candid-Models-Types-CandidType,EdjCase-ICP-Candid-Models-Values-CandidValue[]- 'EdjCase.ICP.Candid.Models.CandidTypedValue.Vector(EdjCase.ICP.Candid.Models.Types.CandidType,EdjCase.ICP.Candid.Models.Values.CandidValue[])')
   - [Vector\`\`1(innerType,values,valueConverter)](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-Vector``1-EdjCase-ICP-Candid-Models-Types-CandidType,System-Collections-Generic-IEnumerable{``0},System-Func{``0,EdjCase-ICP-Candid-Models-Values-CandidValue}- 'EdjCase.ICP.Candid.Models.CandidTypedValue.Vector``1(EdjCase.ICP.Candid.Models.Types.CandidType,System.Collections.Generic.IEnumerable{``0},System.Func{``0,EdjCase.ICP.Candid.Models.Values.CandidValue})')
   - [op_Equality()](#M-EdjCase-ICP-Candid-Models-CandidTypedValue-op_Equality-EdjCase-ICP-Candid-Models-CandidTypedValue,EdjCase-ICP-Candid-Models-CandidTypedValue- 'EdjCase.ICP.Candid.Models.CandidTypedValue.op_Equality(EdjCase.ICP.Candid.Models.CandidTypedValue,EdjCase.ICP.Candid.Models.CandidTypedValue)')
@@ -4137,35 +4136,6 @@ Value of type T
 | ---- | ----------- |
 | T | Type to convert the candid value to |
 
-<a name='M-EdjCase-ICP-Candid-Models-CandidTypedValue-ToOptionalObject``1-EdjCase-ICP-Candid-CandidConverter-'></a>
-### ToOptionalObject\`\`1(converter) `method`
-
-##### Summary
-
-Helper method to convert a typed value to an optional value. The typed value must be an opt
-
-##### Returns
-
-Optional value of T
-
-##### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| converter | [EdjCase.ICP.Candid.CandidConverter](#T-EdjCase-ICP-Candid-CandidConverter 'EdjCase.ICP.Candid.CandidConverter') | Optional. Converter to use for the conversion, otherwise will use default converter |
-
-##### Generic Types
-
-| Name | Description |
-| ---- | ----------- |
-| T | Type to convert the candid value to |
-
-##### Exceptions
-
-| Name | Description |
-| ---- | ----------- |
-| [System.InvalidOperationException](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.InvalidOperationException 'System.InvalidOperationException') | Throws if the value is not an opt |
-
 <a name='M-EdjCase-ICP-Candid-Models-CandidTypedValue-Vector-EdjCase-ICP-Candid-Models-Types-CandidType,EdjCase-ICP-Candid-Models-Values-CandidValue[]-'></a>
 ### Vector(innerType,values) `method`
 

diff --git a/src/Candid/API.xml b/src/Candid/API.xml
diff --git a/src/Candid/Models/CandidTypedValue.cs b/src/Candid/Models/CandidTypedValue.cs
@@ -30,23 +30,7 @@ public CandidTypedValue(CandidValue value, CandidType type)
 			this.Value = value ?? throw new ArgumentNullException(nameof(value));
 			this.Type = type ?? throw new ArgumentNullException(nameof(type));
 		}
-
-		/// <summary>
-		/// Helper method to convert a typed value to an optional value. The typed value must be an opt
-		/// </summary>
-		/// <typeparam name="T">Type to convert the candid value to</typeparam>
-		/// <param name="converter">Optional. Converter to use for the conversion, otherwise will use default converter</param>
-		/// <returns>Optional value of T</returns>
-		/// <exception cref="InvalidOperationException">Throws if the value is not an opt</exception>
-		public OptionalValue<T> ToOptionalObject<T>(CandidConverter? converter = null)
-		{
-			if (this.Value is CandidOptional o)
-			{
-				return (converter ?? CandidConverter.Default).ToOptionalObject<T>(o);
-			}
-			throw new InvalidOperationException("Value must be an optional type");
-		}
-
+
 		/// <summary>
 		/// Helper method to convert a typed value to an generic type value
 		/// </summary>
@@ -55,7 +39,7 @@ public OptionalValue<T> ToOptionalObject<T>(CandidConverter? converter = null)
 		/// <returns>Value of type T</returns>
 		public T ToObject<T>(CandidConverter? converter = null)
 		{
-			return this.ToOptionalObject<T>(converter).GetValueOrThrow();
+			return (converter ?? CandidConverter.Default).ToObject<T>(this.Value);
 		}
 
 		/// <inheritdoc cref="CandidValue.AsPrimitive"/>