Merge pull request #7 from IliyanIlievPH/2

Closes #2
OpenMAVN · Apr 14, 2020 · 62aaece · 62aaece
2 parents cd19955 + b1b5216
commit 62aaece
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/client/MAVN.Service.CrossChainTransfers.Client/AutofacExtension.cs b/client/MAVN.Service.CrossChainTransfers.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(CrossChainTransfersServiceClientSettings.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/src/MAVN.Service.CrossChainTransfers.DomainServices/Common/BlockchainEncodingService.cs b/src/MAVN.Service.CrossChainTransfers.DomainServices/Common/BlockchainEncodingService.cs
@@ -1,6 +1,6 @@
-using System.Numerics;
+using System.Numerics;
 using Falcon.Numerics;
-using Lykke.PrivateBlockchain.Definitions;
+using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.CrossChainTransfers.Domain.Common;
 using Nethereum.ABI.FunctionEncoding;
 using Nethereum.Contracts;

diff --git a/src/MAVN.Service.CrossChainTransfers.DomainServices/Common/BlockchainEventDecoder.cs b/src/MAVN.Service.CrossChainTransfers.DomainServices/Common/BlockchainEventDecoder.cs
@@ -1,5 +1,5 @@
-using AutoMapper;
-using Lykke.PrivateBlockchain.Definitions;
+using AutoMapper;
+using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.CrossChainTransfers.Domain.Common;
 using MAVN.Service.CrossChainTransfers.Domain.Enums;
 using MAVN.Service.CrossChainTransfers.Domain.Models;

diff --git a/...CrossChainTransfers.DomainServices/MAVN.Service.CrossChainTransfers.DomainServices.csproj b/...CrossChainTransfers.DomainServices/MAVN.Service.CrossChainTransfers.DomainServices.csproj
@@ -11,12 +11,12 @@
     <PackageReference Include="Falcon.Job.EthereumBridge.Contract" Version="2.2.0" />
     <PackageReference Include="Falcon.Job.QuorumTransactionWatcher.Contract" Version="4.8.0" />
     <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
-    <PackageReference Include="Falcon.PrivateBlockchain.MVNGateway" Version="2.1.0" />
     <PackageReference Include="Falcon.Service.CrossChainWalletLinker.Client" Version="1.2.0" />
     <PackageReference Include="Falcon.Service.NotificationSystem.SubscriberContract" Version="1.0.2" />
     <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Client" Version="2.9.0" />
     <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Contract" Version="2.13.0" />
     <PackageReference Include="Falcon.Service.WalletManagement.Client" Version="3.5.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="MAVN.PrivateBlockchain.MVNGateway" Version="1.0.0-beta.1" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.CrossChainTransfers.DomainServices/Services/FeesService.cs b/src/MAVN.Service.CrossChainTransfers.DomainServices/Services/FeesService.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Falcon.Numerics;
 using MAVN.Service.CrossChainTransfers.Domain.Services;
 using Lykke.Service.PrivateBlockchainFacade.Client;
 using Lykke.Service.PrivateBlockchainFacade.Client.Models;
-using FeesError = Lykke.Service.CrossChainTransfers.Domain.Enums.FeesError;
+using FeesError = MAVN.Service.CrossChainTransfers.Domain.Enums.FeesError;
 
 namespace MAVN.Service.CrossChainTransfers.DomainServices.Services
 {

diff --git a/src/MAVN.Service.CrossChainTransfers/MappingProfiles/AutoMapperProfile.cs b/src/MAVN.Service.CrossChainTransfers/MappingProfiles/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
-using AutoMapper;
+using AutoMapper;
 using Falcon.Numerics;
-using Lykke.PrivateBlockchain.Definitions;
+using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.CrossChainTransfers.Domain.Models;
 
 namespace MAVN.Service.CrossChainTransfers.MappingProfiles