Fix warns (WalletWasabi#13232)

* Remove static file middleware * Fix a few warnings
Kukks · Jul 25, 2024 · 393b728 · 393b728
1 parent cb570da
commit 393b728
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/Startup.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/Startup.cs
@@ -20,7 +20,6 @@ public Startup(IConfiguration configuration)
 
 	public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 	{
-		app.UseStaticFiles();
 		app.UseRouting();
 		app.UseEndpoints(endpoints => endpoints.MapControllers());
 	}

diff --git a/WalletWasabi/BitcoinCore/CoreNode.cs b/WalletWasabi/BitcoinCore/CoreNode.cs
@@ -36,7 +36,7 @@ public CoreNode(string dataDir, Network network, MempoolService mempoolService,
 	public EndPoint P2pEndPoint { get; }
 	public EndPoint RpcEndPoint { get; }
 	public IRPCClient RpcClient { get; }
-	private BitcoindRpcProcessBridge Bridge { get; set; }
+	private BitcoindRpcProcessBridge? Bridge { get; set; }
 	public string DataDir { get; }
 	public Network Network { get; }
 	public MempoolService MempoolService { get; }

diff --git a/WalletWasabi/BitcoinCore/Rpc/RpcParser.cs b/WalletWasabi/BitcoinCore/Rpc/RpcParser.cs
@@ -74,7 +74,7 @@ public static VerboseBlockInfo ParseVerboseBlockResponse(string getBlockResponse
 						outPoint: new OutPoint(uint256.Parse(txInJson.GetProperty("txid").GetString()), txInJson.GetProperty("vout").GetUInt32()),
 						prevOutput: new VerboseOutputInfo(
 							value: Money.Coins(prevOut.GetProperty("value").GetDecimal()),
-							scriptPubKey: Script.FromHex(scriptPubKey.GetProperty("hex").GetString()),
+							scriptPubKey: Script.FromHex(scriptPubKey.GetProperty("hex").GetString()!),
 							pubkeyType: scriptPubKey.GetProperty("type").GetString()));
 				}
 
@@ -86,7 +86,7 @@ public static VerboseBlockInfo ParseVerboseBlockResponse(string getBlockResponse
 				var scriptPubKey = txoutJson.GetProperty("scriptPubKey");
 				var output = new VerboseOutputInfo(
 					value: Money.Coins(txoutJson.GetProperty("value").GetDecimal()),
-					scriptPubKey: Script.FromHex(scriptPubKey.GetProperty("hex").GetString()),
+					scriptPubKey: Script.FromHex(scriptPubKey.GetProperty("hex").GetString()!),
 					pubkeyType: scriptPubKey.GetProperty("type").GetString());
 
 				outputs.Add(output);

diff --git a/WalletWasabi/Rpc/JsonRpcRequestHandler.cs b/WalletWasabi/Rpc/JsonRpcRequestHandler.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices.JavaScript;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -119,7 +120,16 @@ private async Task<string> HandleRequestAsync(string path, JsonRpcRequest jsonRp
 							$"A value for the '{parameter.name}' is missing.",
 							jsonRpcRequest.Id);
 					}
-					parameters.Add(jObj[parameter.name].ToObject(parameter.type, DefaultSerializer));
+
+					var parameterValue = jObj[parameter.name]!;
+					if (parameterValue.ToObject(parameter.type, DefaultSerializer) is not { } parameterTypedValue)
+					{
+						return Error(
+							JsonRpcErrorCodes.InvalidParams,
+							$"A value for the '{parameter.name}' is not of the expected type.",
+							jsonRpcRequest.Id);
+					}
+					parameters.Add(parameterTypedValue);
 				}
 			}
 
@@ -156,17 +166,17 @@ private async Task<string> HandleRequestAsync(string path, JsonRpcRequest jsonRp
 				return "";
 			}
 
-			JsonRpcResponse? response = null;
+			JsonRpcResponse? response;
 			if (procedureMetadata.MethodInfo.IsAsync())
 			{
 				if (!procedureMetadata.MethodInfo.ReturnType.IsGenericType)
 				{
-					await ((Task)result).ConfigureAwait(false);
+					await ((Task)result!).ConfigureAwait(false);
 					response = JsonRpcResponse.CreateResultResponse(jsonRpcRequest.Id);
 				}
 				else
 				{
-					var ret = await ((dynamic)result).ConfigureAwait(false);
+					var ret = await ((dynamic)result!).ConfigureAwait(false);
 					response = JsonRpcResponse.CreateResultResponse(jsonRpcRequest.Id, ret);
 				}
 			}

diff --git a/WalletWasabi/WebClients/PayJoin/PayjoinClientParameters.cs b/WalletWasabi/WebClients/PayJoin/PayjoinClientParameters.cs
@@ -4,8 +4,8 @@ namespace WalletWasabi.WebClients.PayJoin;
 
 public class PayjoinClientParameters
 {
-	public Money MaxAdditionalFeeContribution { get; set; }
-	public FeeRate MinFeeRate { get; set; }
+	public Money? MaxAdditionalFeeContribution { get; set; }
+	public FeeRate? MinFeeRate { get; set; }
 	public int? AdditionalFeeOutputIndex { get; set; }
 	public bool DisableOutputSubstitution { get; set; }
 	public int Version { get; set; } = 1;