Change uses of IRelativeHttpClient to IHttpClient.
This is trivial renaming. No change of functionality.
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
@@ -101,7 +101,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
}
- IRelativeHttpClient httpClient = Global.Synchronizer.WasabiClientFactory.NewHttpClient(() => payjoinEndPointUri, isolateStream: false);
+ IHttpClient httpClient = Global.Synchronizer.WasabiClientFactory.NewHttpClient(() => payjoinEndPointUri, isolateStream: false);
return new PayjoinClient(payjoinEndPointUri, httpClient);
}

MODIFY
WalletWasabi.Tests/UnitTests/Clients/MockTorHttpClient.cs
WalletWasabi.Tests/UnitTests/Clients/MockTorHttpClient.cs
@@ -8,7 +8,7 @@ using WalletWasabi.Tor.Http;
namespace WalletWasabi.Tests.UnitTests.Clients
{
- public class MockTorHttpClient : IRelativeHttpClient
+ public class MockTorHttpClient : IHttpClient
{
public Func<Uri> DestinationUriAction => () => new Uri("https://payment.server.org/pj");

MODIFY
WalletWasabi/CoinJoin/Client/Clients/AliceClientBase.cs
WalletWasabi/CoinJoin/Client/Clients/AliceClientBase.cs
@@ -46,7 +46,7 @@ namespace WalletWasabi.CoinJoin.Client.Clients
public BitcoinAddress[] RegisteredAddresses { get; }
public Requester[] Requesters { get; }
- public IRelativeHttpClient TorClient { get; }
+ public IHttpClient TorClient { get; }
public static async Task<AliceClient4> CreateNewAsync(
long roundId,

MODIFY
WalletWasabi/CoinJoin/Client/Clients/BobClient.cs
WalletWasabi/CoinJoin/Client/Clients/BobClient.cs
@@ -12,12 +12,12 @@ namespace WalletWasabi.CoinJoin.Client.Clients
public class BobClient
{
/// <inheritdoc/>
- public BobClient(IRelativeHttpClient httpClient)
+ public BobClient(IHttpClient httpClient)
{
HttpClient = httpClient;
}
- private IRelativeHttpClient HttpClient { get; }
+ private IHttpClient HttpClient { get; }
/// <returns>If the phase is still in OutputRegistration.</returns>
public async Task<bool> PostOutputAsync(long roundId, ActiveOutput activeOutput)

MODIFY
WalletWasabi/CoinJoin/Client/Clients/SatoshiClient.cs
WalletWasabi/CoinJoin/Client/Clients/SatoshiClient.cs
@@ -12,12 +12,12 @@ namespace WalletWasabi.CoinJoin.Client.Clients
{
public class SatoshiClient
{
- public SatoshiClient(IRelativeHttpClient httpClient)
+ public SatoshiClient(IHttpClient httpClient)
{
HttpClient = httpClient;
}
- private IRelativeHttpClient HttpClient { get; }
+ private IHttpClient HttpClient { get; }
public async Task<IEnumerable<RoundStateResponseBase>> GetAllRoundStatesAsync()
{

MODIFY
WalletWasabi/Tor/Http/BackendHttpClient.cs
WalletWasabi/Tor/Http/BackendHttpClient.cs
@@ -14,18 +14,18 @@ namespace WalletWasabi.Tor.Http
/// Creates a new instance of the object.
/// </summary>
/// <param name="httpClient">Use <see cref="ClearnetHttpClient"/> or <see cref="TorHttpClient"/> to initialize.</param>
- public BackendHttpClient(IRelativeHttpClient httpClient)
+ public BackendHttpClient(IHttpClient httpClient)
{
HttpClient = httpClient;
}
- private IRelativeHttpClient HttpClient { get; }
+ private IHttpClient HttpClient { get; }
/// <summary>
/// Sends an HTTP request to Wasabi Backend.
/// </summary>
/// <param name="method">HTTP method</param>
- /// <param name="apiQuery">API query part to append to <see cref="IRelativeHttpClient.DestinationUriAction"/>.</param>
+ /// <param name="apiQuery">API query part to append to <see cref="IHttpClient.DestinationUriAction"/>.</param>
/// <param name="content">HTTP request content. Only for <see cref="HttpMethod.Post"/> method.</param>
/// <param name="token">Cancellation token to cancel the asynchronous operation.</param>
public Task<HttpResponseMessage> SendAsync(HttpMethod method, string apiQuery, HttpContent? content = null, CancellationToken token = default)

MODIFY
WalletWasabi/Tor/Http/ClearnetHttpClient.cs
WalletWasabi/Tor/Http/ClearnetHttpClient.cs
@@ -11,7 +11,7 @@ namespace WalletWasabi.Tor.Http
/// as HTTP requests are being sent over clearnet.
/// </summary>
/// <remarks>Inner <see cref="HttpClient"/> instance is thread-safe.</remarks>
- public class ClearnetHttpClient : IRelativeHttpClient
+ public class ClearnetHttpClient : IHttpClient
{
static ClearnetHttpClient()
{

MODIFY
WalletWasabi/Tor/Http/TorHttpClient.cs
WalletWasabi/Tor/Http/TorHttpClient.cs
@@ -18,7 +18,7 @@ using WalletWasabi.Tor.Socks5.Models.Fields.OctetFields;
namespace WalletWasabi.Tor.Http
{
- public class TorHttpClient : IRelativeHttpClient, IDisposable
+ public class TorHttpClient : IHttpClient, IDisposable
{
private static DateTimeOffset? TorDoesntWorkSinceBacking = null;

MODIFY
WalletWasabi/WebClients/PayJoin/PayjoinClient.cs
WalletWasabi/WebClients/PayJoin/PayjoinClient.cs
@@ -18,14 +18,14 @@ namespace WalletWasabi.WebClients.PayJoin
{
public class PayjoinClient : IPayjoinClient
{
- public PayjoinClient(Uri paymentUrl, IRelativeHttpClient httpClient)
+ public PayjoinClient(Uri paymentUrl, IHttpClient httpClient)
{
PaymentUrl = paymentUrl;
TorHttpClient = httpClient;
}
public Uri PaymentUrl { get; }
- private IRelativeHttpClient TorHttpClient { get; }
+ private IHttpClient TorHttpClient { get; }
public async Task<PSBT?> RequestPayjoin(PSBT originalTx, IHDKey accountKey, RootedKeyPath rootedKeyPath, HdPubKey changeHdPubKey, CancellationToken cancellationToken)
{

MODIFY
WalletWasabi/WebClients/Wasabi/WasabiClient.cs
WalletWasabi/WebClients/Wasabi/WasabiClient.cs
@@ -19,12 +19,12 @@ namespace WalletWasabi.WebClients.Wasabi
{
public class WasabiClient
{
- public WasabiClient(IRelativeHttpClient httpClient)
+ public WasabiClient(IHttpClient httpClient)
{
HttpClient = httpClient;
}
- private IRelativeHttpClient HttpClient { get; }
+ private IHttpClient HttpClient { get; }
public static Dictionary<uint256, Transaction> TransactionCache { get; } = new Dictionary<uint256, Transaction>();
private static Queue<uint256> TransactionIdQueue { get; } = new Queue<uint256>();

MODIFY
WalletWasabi/WebClients/Wasabi/WasabiClientFactory.cs
WalletWasabi/WebClients/Wasabi/WasabiClientFactory.cs
@@ -46,7 +46,7 @@ namespace WalletWasabi.WebClients.Wasabi
public bool IsTorEnabled => TorEndpoint is { };
/// <summary>Backend HTTP client, shared instance.</summary>
- private IRelativeHttpClient BackendHttpClient { get; }
+ private IHttpClient BackendHttpClient { get; }
/// <summary>Shared instance of <see cref="WasabiClient"/>.</summary>
public WasabiClient SharedWasabiClient { get; }
@@ -62,7 +62,7 @@ namespace WalletWasabi.WebClients.Wasabi
/// <summary>
/// Creates new <see cref="TorHttpClient"/> or <see cref="ClearnetHttpClient"/> based on user settings.
/// </summary>
- public IRelativeHttpClient NewHttpClient(Func<Uri> baseUriFn, bool isolateStream)
+ public IHttpClient NewHttpClient(Func<Uri> baseUriFn, bool isolateStream)
{
if (TorEndpoint is { })
{

Change uses of IRelativeHttpClient to IHttpClient.

This is trivial renaming. No change of functionality.

Signed-off-by: Kiminuo <kiminuo@protonmail.com>