Merge pull request #7 from IliyanIlievPH/2

Closes #2
OpenMAVN · Apr 14, 2020 · a53b069 · a53b069
2 parents 578f006 + e8cb5d5
commit a53b069
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/client/MAVN.Service.QuorumOperationExecutor.Client/AutofacExtension.cs b/client/MAVN.Service.QuorumOperationExecutor.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(QuorumOperationExecutorServiceClientSettings.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.QuorumOperationExecutor.DomainServices/IBlockchain.cs b/src/MAVN.Service.QuorumOperationExecutor.DomainServices/IBlockchain.cs
@@ -1,5 +1,5 @@
-using Lykke.Nethereum.Extension;
-using Lykke.PrivateBlockchain.Services;
+using Lykke.Nethereum.Extension;
+using MAVN.PrivateBlockchain.Services;
 using Nethereum.RPC.Eth.Services;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices

diff --git a/...erationExecutor.DomainServices/MAVN.Service.QuorumOperationExecutor.DomainServices.csproj b/...erationExecutor.DomainServices/MAVN.Service.QuorumOperationExecutor.DomainServices.csproj
@@ -7,15 +7,15 @@
     <ProjectReference Include="..\MAVN.Service.QuorumOperationExecutor.Domain\MAVN.Service.QuorumOperationExecutor.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.PrivateBlockchain.CustomerRegistry" Version="3.0.1" />
-    <PackageReference Include="Falcon.PrivateBlockchain.MVNToken" Version="3.1.0" />
-    <PackageReference Include="Falcon.PrivateBlockchain.MVNGateway" Version="2.1.0" />
+    <PackageReference Include="MAVN.PrivateBlockchain.MVNToken" Version="1.0.0-beta.1" />
+    <PackageReference Include="MAVN.PrivateBlockchain.CustomerRegistry" Version="1.0.0-beta.1" />
+    <PackageReference Include="MAVN.PrivateBlockchain.MVNGateway" Version="1.0.0-beta.1" />
     <PackageReference Include="Falcon.Service.PrivateBlockchainFacade" Version="1.2.0" />
     <PackageReference Include="Falcon.Service.PrivateBlockchainFacade.Contract" Version="2.9.0" />
     <PackageReference Include="Falcon.Service.QuorumTransactionSigner.Client" Version="1.2.0" />
     <PackageReference Include="LykkeBiz.Nethereum.Extension" Version="1.0.11" />
     <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="3.6.0" />
-    <PackageReference Include="Nethereum.Web3" Version="3.6.0" />
+    <PackageReference Include="Nethereum.Web3" Version="3.7.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 </Project>
diff --git a/....QuorumOperationExecutor.DomainServices/Strategies/BuildBonusRewardTransactionStrategy.cs b/....QuorumOperationExecutor.DomainServices/Strategies/BuildBonusRewardTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/...ationExecutor.DomainServices/Strategies/BuildCustomerWalletCreationTransactionStrategy.cs b/...ationExecutor.DomainServices/Strategies/BuildCustomerWalletCreationTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Client;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/...Service.QuorumOperationExecutor.DomainServices/Strategies/BuildSeizeToInternalStrategy.cs b/...Service.QuorumOperationExecutor.DomainServices/Strategies/BuildSeizeToInternalStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/...OperationExecutor.DomainServices/Strategies/BuildSetTransferToPublicNetworkFeeStrategy.cs b/...OperationExecutor.DomainServices/Strategies/BuildSetTransferToPublicNetworkFeeStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/src/MAVN.Service.QuorumOperationExecutor.DomainServices/Strategies/BuildTransferStrategy.cs b/src/MAVN.Service.QuorumOperationExecutor.DomainServices/Strategies/BuildTransferStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 using Nethereum.Hex.HexConvertors.Extensions;
 

diff --git a/...OperationExecutor.DomainServices/Strategies/BuildTransferToExternalTransactionStrategy.cs b/...OperationExecutor.DomainServices/Strategies/BuildTransferToExternalTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 using Nethereum.Hex.HexConvertors.Extensions;
 

diff --git a/...OperationExecutor.DomainServices/Strategies/BuildTransferToInternalTransactionStrategy.cs b/...OperationExecutor.DomainServices/Strategies/BuildTransferToInternalTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/...uorumOperationExecutor.DomainServices/Strategies/BuildWalletLinkingTransactionStrategy.cs b/...uorumOperationExecutor.DomainServices/Strategies/BuildWalletLinkingTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/...rumOperationExecutor.DomainServices/Strategies/BuildWalletUnlinkingTransactionStrategy.cs b/...rumOperationExecutor.DomainServices/Strategies/BuildWalletUnlinkingTransactionStrategy.cs
@@ -1,5 +1,5 @@
-using System;
-using Lykke.PrivateBlockchain.Definitions;
+using System;
+using MAVN.PrivateBlockchain.Definitions;
 using Lykke.Service.PrivateBlockchainFacade.Contract.Operations;
 
 namespace MAVN.Service.QuorumOperationExecutor.DomainServices.Strategies

diff --git a/src/MAVN.Service.QuorumOperationExecutor/Clients/BlockchainWrapper.cs b/src/MAVN.Service.QuorumOperationExecutor/Clients/BlockchainWrapper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Net.Http;
@@ -16,8 +16,8 @@
 using Nethereum.JsonRpc.WebSocketClient;
 using Nethereum.RPC.Eth.Services;
 using Nethereum.Web3;
-using MVNGatewayService = Lykke.PrivateBlockchain.Services.MVNGatewayService;
-using MVNTokenService = Lykke.PrivateBlockchain.Services.MVNTokenService;
+using MVNGatewayService = MAVN.PrivateBlockchain.Services.MVNGatewayService;
+using MVNTokenService = MAVN.PrivateBlockchain.Services.MVNTokenService;
 
 namespace MAVN.Service.QuorumOperationExecutor.Clients
 {

diff --git a/src/MAVN.Service.QuorumOperationExecutor/Controllers/OperationsController.cs b/src/MAVN.Service.QuorumOperationExecutor/Controllers/OperationsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using MAVN.Service.QuorumOperationExecutor.Client;
@@ -9,8 +9,8 @@
 using Lykke.Service.QuorumTransactionSigner.Client.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 
-using ClientOperationState = Lykke.Service.QuorumOperationExecutor.Client.Models.Responses.OperationState;
-using DomainOperationState = Lykke.Service.QuorumOperationExecutor.Domain.OperationState;
+using ClientOperationState = MAVN.Service.QuorumOperationExecutor.Client.Models.Responses.OperationState;
+using DomainOperationState = MAVN.Service.QuorumOperationExecutor.Domain.OperationState;
 
 namespace MAVN.Service.QuorumOperationExecutor.Controllers
 {

diff --git a/src/MAVN.Service.QuorumOperationExecutor/Controllers/TransactionsController.cs b/src/MAVN.Service.QuorumOperationExecutor/Controllers/TransactionsController.cs
@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using MAVN.Service.QuorumOperationExecutor.Client;
 using MAVN.Service.QuorumOperationExecutor.Client.Models.Responses;
 using MAVN.Service.QuorumOperationExecutor.Domain.Services;
 using Microsoft.AspNetCore.Mvc;
 
-using DomainTransactionState = Lykke.Service.QuorumOperationExecutor.Domain.TransactionState;
-using ClientTransactionState = Lykke.Service.QuorumOperationExecutor.Client.Models.Responses.TransactionState;
+using DomainTransactionState = MAVN.Service.QuorumOperationExecutor.Domain.TransactionState;
+using ClientTransactionState = MAVN.Service.QuorumOperationExecutor.Client.Models.Responses.TransactionState;
 
 namespace MAVN.Service.QuorumOperationExecutor.Controllers
 {