Swapped out tibetclient for tibby 0.0.6 nuget package

SwapHunter.Tests/Core/SwapHunterFixture.cs

@@ -11,10 +11,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using SwapHunter.Client;
 using SwapHunter.Client.Chia;
-using SwapHunter.Client.TibetSwap;
 using SwapHunter.Worker;
+using Tibby.Extensions;
+using Tibby.Models;
 
 namespace SwapHunter.Tests.Core;
 
@@ -51,24 +53,24 @@ public SwapHunterFixture()
                 webHost.ConfigureServices((hostContext, services) =>
                 {
                     var chiaRpcOptions = hostContext.Configuration.GetSection("ChiaRpc").Get<ChiaRpcOptions>();
-                    var tibetSwapOptions = hostContext.Configuration.GetSection("TibetSwap").Get<TibetSwapOptions>();
                     var handler = new SocketsHttpHandler();
                     handler.SslOptions.ClientCertificates =
                         GetCerts(chiaRpcOptions.Wallet_cert_path, chiaRpcOptions.Wallet_key_path);
                     handler.SslOptions.RemoteCertificateValidationCallback += ValidateServerCertificate;
 
+                    services.AddLogging(loggingBuilder => {
+                        loggingBuilder.AddFile("app.log", append:true);
+                    });
+
                     services.AddHttpClient<IChiaRpcClient, ChiaRpcClient>(c =>
                     {
                         c.BaseAddress = new System.Uri(chiaRpcOptions.WalletRpcEndpoint);
                     }).ConfigurePrimaryHttpMessageHandler(() => { return handler; });
 
-                    services.AddHttpClient<ITibetClient, TibetClient>(c =>
-                    {
-                        c.BaseAddress = new System.Uri(tibetSwapOptions.ApiEndpoint);
-                    });
+                    services.Configure<TibetSwapOptions>(hostContext.Configuration.GetSection("TibetSwap"));
+                    services.AddTibbyClient();
 
                     services.AddSingleton<IOfferService, OfferService>();
-                    services.Configure<TibetSwapOptions>(hostContext.Configuration.GetSection("TibetSwap"));
                     services.Configure<ChiaRpcOptions>(hostContext.Configuration.GetSection("ChiaRpc"));
                 });
                 webHost.UseTestServer();

SwapHunter.Tests/Core/SwapHunterTestBase.cs

@@ -8,8 +8,8 @@
 using Microsoft.Extensions.Hosting;
 using SwapHunter.Client;
 using SwapHunter.Client.Chia;
-using SwapHunter.Client.TibetSwap;
 using SwapHunter.Worker;
+using Tibby;
 using Xunit;
 
 namespace SwapHunter.Tests.Core;
@@ -18,7 +18,7 @@ namespace SwapHunter.Tests.Core;
 public class SwapHunterTestBase : IClassFixture<SwapHunterFixture>
 {
     public SwapHunterFixture Fixture { get; }
-    public ITibetClient TibetClient => Fixture.TestHost.Services.GetService<ITibetClient>();
+    public ITibbyClient TibetClient => Fixture.TestHost.Services.GetService<ITibbyClient>();
 
     public IChiaRpcClient ChiaWalletClient => Fixture.TestHost.Services.GetService<IChiaRpcClient>();
 

SwapHunter.Tests/OfferServiceTests.cs

@@ -1,5 +1,3 @@
-using Microsoft.Extensions.Hosting;
-using SwapHunter.Client.TibetSwap;
 using SwapHunter.Tests.Core;
 using Xunit;
 

SwapHunter.Tests/SwapHunter.Tests.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="NReco.Logging.File" Version="1.1.6" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

SwapHunter.Tests/TibetSwapTests/TibetClientTests.cs

@@ -6,7 +6,7 @@ namespace SwapHunter.Tests.TibetClientTests;
 
 public class TibetClientTests : SwapHunterTestBase
 {
-    public TibetClientTests(SwapHunterFixture baseTest):base(baseTest)
+    public TibetClientTests(SwapHunterFixture baseTest) : base(baseTest)
     {
     }
 
@@ -16,56 +16,56 @@ public async Task calling_router_endpoint_returns_ok()
         // arrange
 
         // act
-        var router = await TibetClient.GetRouter();
-        
+        var (router, _) = await TibetClient.GetRouter();
+
         // assert
         Assert.NotNull(router);
-        Assert.Equal("testnet10",router.Network);
-        Assert.Equal("d037e35cc7269df10e45d0d152d2ff53d26f318adf5ea20578e5cfb80b5b2a71",router.Launcher_Id);
-        Assert.Equal("2223a2a9c037ae5844f7fbf2ecfa16740e31bd2d3ffe2f4a76006e266947776f",router.Current_Id);
+        Assert.Equal("testnet10", router.Network);
+        Assert.Equal("d037e35cc7269df10e45d0d152d2ff53d26f318adf5ea20578e5cfb80b5b2a71", router.Launcher_Id);
+        Assert.Equal("2223a2a9c037ae5844f7fbf2ecfa16740e31bd2d3ffe2f4a76006e266947776f", router.Current_Id);
     }
-    
+
     [Fact]
     public async Task calling_quote_endpoint_returns_ok()
     {
         // arrange
         var dbx_txch_pair = "3f2b9ddb0d90b81f43d86870d31b505df5dd377f4215928a436bc51d9d613294";
 
         // act
-        var quote = await TibetClient.GetQuote(dbx_txch_pair, 1000);
-        
+        var (quote, _) = await TibetClient.GetQuote(dbx_txch_pair, 1000);
+
         // assert
         Assert.NotNull(quote);
     }
-    
+
     [Fact]
     public async Task calling_tokens_endpoint_returns_ok()
     {
         // arrange
-        
+
         // act
-        var pairs = await TibetClient.GetTokenPairs();
-        
+        var (pairs, _) = await TibetClient.GetTokenPairs();
+
         // assert
         Assert.NotNull(pairs);
     }
-    
+
     [Fact]
     public async Task calling_gettoken_endpoint_returns_ok()
     {
         // arrange
-        var tokens = await TibetClient.GetTokenPairs();
+        var (tokens, _) = await TibetClient.GetTokenPairs();
         var dbx = tokens.FirstOrDefault(x => x.short_name == "TDBX");
-        
+
         // act
-        var token = await TibetClient.GetToken(dbx.Asset_id);
-        
+        var (token, _) = await TibetClient.GetToken(dbx.Asset_id);
+
         // assert
         Assert.NotNull(token);
         Assert.Equal(dbx.Asset_id, token.Asset_id);
         Assert.Equal(dbx.pair_id, token.pair_id);
-        Assert.Equal(dbx.name,token.name);
-        Assert.Equal(dbx.short_name,token.short_name);
-        Assert.Equal(dbx.verified,token.verified);
+        Assert.Equal(dbx.name, token.name);
+        Assert.Equal(dbx.short_name, token.short_name);
+        Assert.Equal(dbx.verified, token.verified);
     }
 }

SwapHunter/Client/Chia/ChiaRpcClient.cs

@@ -10,18 +10,23 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using ILogger = Serilog.ILogger;
 
 namespace SwapHunter.Client.Chia
 {
   public class ChiaRpcClient : IChiaRpcClient
   {
     IOptions<ChiaRpcOptions> _options { get; set; }
     private HttpClient _client;
+    private ILogger<ChiaRpcClient> _logger { get; set; }
 
-    public ChiaRpcClient(IOptions<ChiaRpcOptions> options, HttpClient httpClient) 
+    public ChiaRpcClient(IOptions<ChiaRpcOptions> options, HttpClient httpClient, ILogger<ChiaRpcClient> logger) 
     {
       _options = options;
       _client = httpClient;
+      _logger = logger;
     }
 
     //get_sync_status
@@ -40,10 +45,12 @@ public async Task<CreateOfferResponse> CreateOffer(string assetid, double reques
 
       var targetJObject = JObject.FromObject(obj);
       var content = new StringContent(targetJObject.ToString(), Encoding.UTF8, "application/json");
+      _logger.LogInformation("{@obj}", obj);
       var response = await _client.PostAsync($"/create_offer_for_ids", content);
       response.EnsureSuccessStatusCode();
       string responseBody = await response.Content.ReadAsStringAsync();
       var offer = JsonConvert.DeserializeObject<CreateOfferResponse>(responseBody);
+      _logger.LogInformation("{@offer}", offer);
       return offer;
     }
   }