Correct method, parameter, variable names
MODIFY
WalletWasabi.Gui/CommandLine/Daemon.cs
WalletWasabi.Gui/CommandLine/Daemon.cs
@@ -25,7 +25,7 @@ namespace WalletWasabi.Gui.CommandLine
{
Logger.LogStarting("Wasabi Daemon");
- KeyManager keyManager = TryGetKeymanagerFromWalletName(walletName);
+ KeyManager keyManager = TryGetKeyManagerFromWalletName(walletName);
if (keyManager is null)
{
return;
@@ -118,7 +118,7 @@ namespace WalletWasabi.Gui.CommandLine
}
}
- public KeyManager TryGetKeymanagerFromWalletName(string walletName)
+ public KeyManager TryGetKeyManagerFromWalletName(string walletName)
{
try
{

MODIFY
WalletWasabi.Gui/CommandLine/PasswordFinderCommand.cs
WalletWasabi.Gui/CommandLine/PasswordFinderCommand.cs
@@ -67,7 +67,7 @@ namespace WalletWasabi.Gui.CommandLine
}
else if (!string.IsNullOrWhiteSpace(WalletName))
{
- KeyManager km = Daemon.TryGetKeymanagerFromWalletName(WalletName);
+ KeyManager km = Daemon.TryGetKeyManagerFromWalletName(WalletName);
if (km is null)
{
error = true;

MODIFY
WalletWasabi/Extensions/RPCClientExtensions.cs
WalletWasabi/Extensions/RPCClientExtensions.cs
@@ -26,12 +26,12 @@ namespace NBitcoin.RPC
/// <summary>
/// Waits for a specific new block and returns useful info about it.
/// </summary>
- /// <param name="blockhash">Block hash to wait for</param>
+ /// <param name="blockHash">Block hash to wait for</param>
/// <param name="timeout">(int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.</param>
/// <returns>Returns the current block on timeout or exit</returns>
- public static async Task<(Height height, uint256 hash)> WaitForBlockAsync(this RPCClient rpc, uint256 blockhash, long timeout = 0)
+ public static async Task<(Height height, uint256 hash)> WaitForBlockAsync(this RPCClient rpc, uint256 blockHash, long timeout = 0)
{
- var resp = await rpc.SendCommandAsync("waitforblock", blockhash, timeout);
+ var resp = await rpc.SendCommandAsync("waitforblock", blockHash, timeout);
return (int.Parse(resp.Result["height"].ToString()), uint256.Parse(resp.Result["hash"].ToString()));
}

MODIFY
WalletWasabi/KeyManagement/KeyManager.cs
WalletWasabi/KeyManagement/KeyManager.cs
@@ -791,21 +791,21 @@ namespace WalletWasabi.KeyManagement
}
/// <returns>The network the keymanager was used the last time on.</returns>
- public void AssertNetworkOrClearBlockstate(Network expectednetwork)
+ public void AssertNetworkOrClearBlockState(Network expectedNetwork)
{
lock (BlockchainStateLock)
{
var lastNetwork = BlockchainState.Network;
- if (lastNetwork is null || lastNetwork != expectednetwork)
+ if (lastNetwork is null || lastNetwork != expectedNetwork)
{
- BlockchainState.Network = expectednetwork;
+ BlockchainState.Network = expectedNetwork;
BlockchainState.BestHeight = 0;
BlockchainState.BlockStates.Clear();
ToFileNoBlockchainStateLock();
if (lastNetwork != null)
{
- Logger.LogWarning<KeyManager>($"Wallet is opened on {expectednetwork}. Last time it was opened on {lastNetwork}.");
+ Logger.LogWarning<KeyManager>($"Wallet is opened on {expectedNetwork}. Last time it was opened on {lastNetwork}.");
}
Logger.LogInfo<KeyManager>("Blockchain cache is cleared.");
}

MODIFY
WalletWasabi/Services/WalletService.cs
WalletWasabi/Services/WalletService.cs
@@ -293,14 +293,14 @@ namespace WalletWasabi.Services
}
// Go through the keymanager's index.
- KeyManager.AssertNetworkOrClearBlockstate(Network);
+ KeyManager.AssertNetworkOrClearBlockState(Network);
Height bestKeyManagerHeight = KeyManager.GetBestHeight();
- foreach (BlockState blockstate in KeyManager.GetTransactionIndex())
+ foreach (BlockState blockState in KeyManager.GetTransactionIndex())
{
- var relevantTransactions = confirmedTransactions.Where(x => x.BlockHash == blockstate.BlockHash).ToArray();
- var block = await GetOrDownloadBlockAsync(blockstate.BlockHash, cancel);
- await ProcessBlockAsync(blockstate.BlockHeight, block, blockstate.TransactionIndices, relevantTransactions);
+ var relevantTransactions = confirmedTransactions.Where(x => x.BlockHash == blockState.BlockHash).ToArray();
+ var block = await GetOrDownloadBlockAsync(blockState.BlockHash, cancel);
+ await ProcessBlockAsync(blockState.BlockHeight, block, blockState.TransactionIndices, relevantTransactions);
}
// Go through the filters and que to download the matches.

Correct method, parameter, variable names