Merge pull request #8 from IliyanIlievPH/2

Closes #2
OpenMAVN · Apr 14, 2020 · 760acbc · 760acbc
2 parents 256f1e7 + aba3ef1
commit 760acbc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/client/MAVN.Service.CrossChainWalletLinker.Client/AutofacExtension.cs b/client/MAVN.Service.CrossChainWalletLinker.Client/AutofacExtension.cs
@@ -1,4 +1,4 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using Lykke.HttpClientGenerator;
 using Lykke.HttpClientGenerator.Infrastructure;
@@ -30,7 +30,7 @@ public static class AutofacExtension
             if (string.IsNullOrWhiteSpace(settings.ServiceUrl))
                 throw new ArgumentException("Value cannot be null or whitespace.", nameof(CrossChainWalletLinkerServiceClientSettings.ServiceUrl));
 
-            var clientBuilder = HttpClientGenerator.HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
+            var clientBuilder = HttpClientGenerator.BuildForUrl(settings.ServiceUrl)
                 .WithAdditionalCallsWrapper(new ExceptionHandlerCallsWrapper());
 
             clientBuilder = builderConfigure?.Invoke(clientBuilder) ?? clientBuilder.WithoutRetries();

diff --git a/...N.Service.CrossChainWalletLinker.Domain/MAVN.Service.CrossChainWalletLinker.Domain.csproj b/...N.Service.CrossChainWalletLinker.Domain/MAVN.Service.CrossChainWalletLinker.Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
-    <PackageReference Include="Falcon.PrivateBlockchain.MVNGateway" Version="2.1.0" />
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
     <PackageReference Include="Lykke.Common.MsSql" Version="2.3.0" />
+    <PackageReference Include="MAVN.PrivateBlockchain.MVNGateway" Version="1.0.0-beta.1" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.CrossChainWalletLinker.DomainServices/BlockchainEventDecoder.cs b/src/MAVN.Service.CrossChainWalletLinker.DomainServices/BlockchainEventDecoder.cs
@@ -1,5 +1,5 @@
-using AutoMapper;
-using Lykke.PrivateBlockchain.Definitions;
+using AutoMapper;
+using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.CrossChainWalletLinker.Domain.Enums;
 using MAVN.Service.CrossChainWalletLinker.Domain.Models;
 using MAVN.Service.CrossChainWalletLinker.Domain.Services;

diff --git a/src/MAVN.Service.CrossChainWalletLinker.DomainServices/SignatureValidator.cs b/src/MAVN.Service.CrossChainWalletLinker.DomainServices/SignatureValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Common.Log;
 using Lykke.Common.Log;
 using MAVN.Service.CrossChainWalletLinker.Domain.Services;
@@ -39,7 +39,7 @@ public bool Validate(string plainMessage, string signature, string publicAddress
                 return false;
             }
 
-            return string.Equals(recoveredAddress, publicAddress, StringComparison.CurrentCultureIgnoreCase);
+            return string.Equals(recoveredAddress, publicAddress, StringComparison.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/src/MAVN.Service.CrossChainWalletLinker/AutoMapperProfile.cs b/src/MAVN.Service.CrossChainWalletLinker/AutoMapperProfile.cs
@@ -1,5 +1,5 @@
-using AutoMapper;
-using Lykke.PrivateBlockchain.Definitions;
+using AutoMapper;
+using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.CrossChainWalletLinker.Client.Models;
 using MAVN.Service.CrossChainWalletLinker.Domain.Models;
 

diff --git a/src/MAVN.Service.CrossChainWalletLinker/Controllers/LinkRequestsController.cs b/src/MAVN.Service.CrossChainWalletLinker/Controllers/LinkRequestsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Net;
 using System.Threading.Tasks;
@@ -9,7 +9,7 @@
 using MAVN.Service.CrossChainWalletLinker.Client.Models;
 using MAVN.Service.CrossChainWalletLinker.Domain.Services;
 using Microsoft.AspNetCore.Mvc;
-using LinkingError = Lykke.Service.CrossChainWalletLinker.Domain.Models.LinkingError;
+using LinkingError = MAVN.Service.CrossChainWalletLinker.Domain.Models.LinkingError;
 
 namespace MAVN.Service.CrossChainWalletLinker.Controllers
 {

diff --git a/tests/MAVN.Service.CrossChainWalletLinker.Tests/WalletLinkerTests.cs b/tests/MAVN.Service.CrossChainWalletLinker.Tests/WalletLinkerTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Lykke.Common.MsSql;
 using Lykke.Logs;
@@ -18,7 +18,7 @@
 using Lykke.Service.WalletManagement.Client.Models.Responses;
 using Moq;
 using Xunit;
-using LinkingError = Lykke.Service.CrossChainWalletLinker.Domain.Models.LinkingError;
+using LinkingError = MAVN.Service.CrossChainWalletLinker.Domain.Models.LinkingError;
 
 namespace MAVN.Service.CrossChainWalletLinker.Tests
 {