Merge pull request #8 from IliyanIlievPH/7

Closes #7
OpenMAVN · May 8, 2020 · 18adbb2 · 18adbb2
2 parents 614280e + 366fcb4
commit 18adbb2
Show file tree

Hide file tree

Showing 30 changed files with 91 additions and 92 deletions.
diff --git a/client/MAVN.Service.Staking.Client/MAVN.Service.Staking.Client.csproj b/client/MAVN.Service.Staking.Client/MAVN.Service.Staking.Client.csproj
@@ -13,9 +13,9 @@
     <None Remove="MAVN.Service.Staking.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
     <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/client/MAVN.Service.Staking.Client/Models/CustomerStakesInformationResponse.cs b/client/MAVN.Service.Staking.Client/Models/CustomerStakesInformationResponse.cs
@@ -1,4 +1,4 @@
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Client.Models
 {

diff --git a/client/MAVN.Service.Staking.Client/Models/ReferralStakeRequest.cs b/client/MAVN.Service.Staking.Client/Models/ReferralStakeRequest.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Client.Models
 {

diff --git a/client/MAVN.Service.Staking.Client/Models/ReferralStakeResponseModel.cs b/client/MAVN.Service.Staking.Client/Models/ReferralStakeResponseModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Client.Models
 {

diff --git a/contract/MAVN.Service.Staking.Contract/Events/ReferralStakeEventBase.cs b/contract/MAVN.Service.Staking.Contract/Events/ReferralStakeEventBase.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Contract.Events
 {

diff --git a/contract/MAVN.Service.Staking.Contract/MAVN.Service.Staking.Contract.csproj b/contract/MAVN.Service.Staking.Contract/MAVN.Service.Staking.Contract.csproj
@@ -5,6 +5,6 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Job.Staking/Modules/JobModule.cs b/src/MAVN.Job.Staking/Modules/JobModule.cs
@@ -1,19 +1,19 @@
-using Autofac;
+using Autofac;
 using Common;
 using JetBrains.Annotations;
 using Lykke.Job.Staking.Services;
 using Lykke.Job.Staking.Settings;
 using Lykke.Sdk;
 using Lykke.Sdk.Health;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
 using MAVN.Service.Staking.Domain.RabbitMq.Handlers;
 using MAVN.Service.Staking.Domain.Services;
 using MAVN.Service.Staking.DomainServices.Common;
 using MAVN.Service.Staking.DomainServices.RabbitMq.Handlers;
 using MAVN.Service.Staking.DomainServices.Services;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client;
 using Lykke.SettingsReader;
 
 namespace Lykke.Job.Staking.Modules

diff --git a/src/MAVN.Job.Staking/Modules/RabbitMqModule.cs b/src/MAVN.Job.Staking/Modules/RabbitMqModule.cs
@@ -1,10 +1,10 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using Lykke.Common;
 using Lykke.Job.Staking.Settings;
 using Lykke.Job.Staking.Settings.JobSettings;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.NotificationSystem.SubscriberContract;
+using MAVN.Service.NotificationSystem.SubscriberContract;
 using MAVN.Service.Staking.Contract.Events;
 using MAVN.Service.Staking.DomainServices.RabbitMq.Subscribers;
 using Lykke.SettingsReader;

diff --git a/src/MAVN.Job.Staking/Settings/AppSettings.cs b/src/MAVN.Job.Staking/Settings/AppSettings.cs
@@ -1,10 +1,10 @@
-using Lykke.Job.Staking.Settings.JobSettings;
+using Lykke.Job.Staking.Settings.JobSettings;
 using Lykke.Job.Staking.Settings.Notifications;
 using Lykke.Sdk.Settings;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.WalletManagement.Client;
 
 namespace Lykke.Job.Staking.Settings
 {

diff --git a/src/MAVN.Service.Staking.Domain/MAVN.Service.Staking.Domain.csproj b/src/MAVN.Service.Staking.Domain/MAVN.Service.Staking.Domain.csproj
@@ -4,8 +4,8 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Numerics" Version="0.1.1" />
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
     <PackageReference Include="Lykke.Common.MsSql" Version="2.3.0" />
+    <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.Staking.Domain/Models/ReferralStakeModel.cs b/src/MAVN.Service.Staking.Domain/Models/ReferralStakeModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Staking.Domain.Enums;
 
 namespace MAVN.Service.Staking.Domain.Models

diff --git a/src/MAVN.Service.Staking.Domain/Repositories/IReferralStakesRepository.cs b/src/MAVN.Service.Staking.Domain/Repositories/IReferralStakesRepository.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using Lykke.Common.MsSql;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;

diff --git a/src/MAVN.Service.Staking.Domain/Services/IBlockchainEncodingService.cs b/src/MAVN.Service.Staking.Domain/Services/IBlockchainEncodingService.cs
@@ -1,4 +1,4 @@
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Domain.Services
 {

diff --git a/src/MAVN.Service.Staking.Domain/Services/IMoneyFormatter.cs b/src/MAVN.Service.Staking.Domain/Services/IMoneyFormatter.cs
@@ -1,4 +1,4 @@
-using Falcon.Numerics;
+using MAVN.Numerics;
 
 namespace MAVN.Service.Staking.Domain.Services
 {

diff --git a/src/MAVN.Service.Staking.Domain/Services/IReferralStakesService.cs b/src/MAVN.Service.Staking.Domain/Services/IReferralStakesService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;
 

diff --git a/src/MAVN.Service.Staking.DomainServices/Common/BlockchainEncodingService.cs b/src/MAVN.Service.Staking.DomainServices/Common/BlockchainEncodingService.cs
@@ -1,4 +1,4 @@
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.PrivateBlockchain.Definitions;
 using MAVN.Service.Staking.Domain.Services;
 using Nethereum.ABI.FunctionEncoding;

diff --git a/src/MAVN.Service.Staking.DomainServices/MAVN.Service.Staking.DomainServices.csproj b/src/MAVN.Service.Staking.DomainServices/MAVN.Service.Staking.DomainServices.csproj
@@ -6,17 +6,16 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Falcon.Job.QuorumTransactionWatcher.Contract" Version="4.8.0" />
-    <PackageReference Include="Falcon.Service.Campaign.Client" Version="7.4.0" />
-    <PackageReference Include="Falcon.Service.CustomerProfile.Client" Version="7.7.0" />
-    <PackageReference Include="Falcon.Service.CustomerProfile.Contract" Version="1.1.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.Common.MsSql" Version="2.3.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
     <PackageReference Include="MAVN.PrivateBlockchain.MVNToken" Version="1.0.0-beta.1" />
+    <PackageReference Include="MAVN.Service.Campaign.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Contract" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.Staking.Contract\MAVN.Service.Staking.Contract.csproj" />

diff --git a/...ing.DomainServices/RabbitMq/Subscribers/CustomerProfileDeactivationRequestedSubscriber.cs b/...ing.DomainServices/RabbitMq/Subscribers/CustomerProfileDeactivationRequestedSubscriber.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Subscriber;
-using Lykke.Service.CustomerProfile.Contract;
+using MAVN.Service.CustomerProfile.Contract;
 using MAVN.Service.Staking.Domain.RabbitMq.Handlers;
 
 namespace MAVN.Service.Staking.DomainServices.RabbitMq.Subscribers

diff --git a/src/MAVN.Service.Staking.DomainServices/RabbitMq/Subscribers/TransactionFailedSubscriber.cs b/src/MAVN.Service.Staking.DomainServices/RabbitMq/Subscribers/TransactionFailedSubscriber.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Subscriber;
-using Lykke.Service.PrivateBlockchainFacade.Contract.Events;
+using MAVN.Service.PrivateBlockchainFacade.Contract.Events;
 using MAVN.Service.Staking.Domain.RabbitMq.Handlers;
 
 namespace MAVN.Service.Staking.DomainServices.RabbitMq.Subscribers

diff --git a/...AVN.Service.Staking.DomainServices/RabbitMq/Subscribers/TransactionSucceededSubscriber.cs b/...AVN.Service.Staking.DomainServices/RabbitMq/Subscribers/TransactionSucceededSubscriber.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
 using Lykke.RabbitMqBroker.Subscriber;
-using Lykke.Service.PrivateBlockchainFacade.Contract.Events;
+using MAVN.Service.PrivateBlockchainFacade.Contract.Events;
 using MAVN.Service.Staking.Domain.RabbitMq.Handlers;
 
 namespace MAVN.Service.Staking.DomainServices.RabbitMq.Subscribers

diff --git a/src/MAVN.Service.Staking.DomainServices/Services/MoneyFormatter.cs b/src/MAVN.Service.Staking.DomainServices/Services/MoneyFormatter.cs
@@ -1,5 +1,5 @@
 using System.Globalization;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Staking.Domain.Services;
 
 namespace MAVN.Service.Staking.DomainServices.Services

diff --git a/src/MAVN.Service.Staking.DomainServices/Services/ReferralStakesService.cs b/src/MAVN.Service.Staking.DomainServices/Services/ReferralStakesService.cs
@@ -1,25 +1,25 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Common.Log;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using Lykke.Common;
 using Lykke.Common.Log;
 using Lykke.Common.MsSql;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.Campaign.Client.Models.Enums;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.CustomerProfile.Client.Models.Enums;
-using Lykke.Service.NotificationSystem.SubscriberContract;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client.Models;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.Campaign.Client.Models.Enums;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client.Models.Enums;
+using MAVN.Service.NotificationSystem.SubscriberContract;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client.Models;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;
 using MAVN.Service.Staking.Domain.Repositories;
 using MAVN.Service.Staking.Domain.Services;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
 
 namespace MAVN.Service.Staking.DomainServices.Services
 {

diff --git a/src/MAVN.Service.Staking.DomainServices/Services/ReferralStakesStatusUpdater.cs b/src/MAVN.Service.Staking.DomainServices/Services/ReferralStakesStatusUpdater.cs
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using Lykke.Common.MsSql;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client.Models;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client.Models;
 using MAVN.Service.Staking.Contract.Events;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;
 using MAVN.Service.Staking.Domain.Repositories;
 using MAVN.Service.Staking.Domain.Services;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
 
 namespace MAVN.Service.Staking.DomainServices.Services
 {

diff --git a/src/MAVN.Service.Staking.MsSqlRepositories/Entities/ReferralStakeEntity.cs b/src/MAVN.Service.Staking.MsSqlRepositories/Entities/ReferralStakeEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;
 

diff --git a/src/MAVN.Service.Staking.MsSqlRepositories/Repositories/ReferralStakesRepository.cs b/src/MAVN.Service.Staking.MsSqlRepositories/Repositories/ReferralStakesRepository.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Falcon.Numerics;
+using MAVN.Numerics;
 using Lykke.Common.MsSql;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;

diff --git a/src/MAVN.Service.Staking/Modules/RabbitMqModule.cs b/src/MAVN.Service.Staking/Modules/RabbitMqModule.cs
@@ -1,10 +1,10 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using Lykke.RabbitMqBroker.Publisher;
 using Lykke.RabbitMqBroker.Subscriber;
-using Lykke.Service.CustomerProfile.Contract;
-using Lykke.Service.NotificationSystem.SubscriberContract;
-using Lykke.Service.PrivateBlockchainFacade.Contract.Events;
+using MAVN.Service.CustomerProfile.Contract;
+using MAVN.Service.NotificationSystem.SubscriberContract;
+using MAVN.Service.PrivateBlockchainFacade.Contract.Events;
 using MAVN.Service.Staking.Contract.Events;
 using MAVN.Service.Staking.DomainServices.RabbitMq.Subscribers;
 using MAVN.Service.Staking.Settings;

diff --git a/src/MAVN.Service.Staking/Modules/ServiceModule.cs b/src/MAVN.Service.Staking/Modules/ServiceModule.cs
@@ -1,17 +1,17 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
 using Lykke.Sdk;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
 using MAVN.Service.Staking.Domain.RabbitMq.Handlers;
 using MAVN.Service.Staking.Domain.Services;
 using MAVN.Service.Staking.DomainServices.Common;
 using MAVN.Service.Staking.DomainServices.RabbitMq.Handlers;
 using MAVN.Service.Staking.DomainServices.Services;
 using MAVN.Service.Staking.Services;
 using MAVN.Service.Staking.Settings;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client;
 using Lykke.SettingsReader;
 
 namespace MAVN.Service.Staking.Modules

diff --git a/src/MAVN.Service.Staking/Settings/AppSettings.cs b/src/MAVN.Service.Staking/Settings/AppSettings.cs
@@ -1,10 +1,10 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Lykke.Sdk.Settings;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client;
 using MAVN.Service.Staking.Settings.Notifications;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client;
 
 namespace MAVN.Service.Staking.Settings
 {

diff --git a/tests/MAVN.Service.Staking.Tests/ReferralStakesServiceTests.cs b/tests/MAVN.Service.Staking.Tests/ReferralStakesServiceTests.cs
@@ -1,26 +1,26 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Lykke.Common.MsSql;
 using Lykke.Logs;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.Campaign.Client.Models.Campaign.Responses;
-using Lykke.Service.Campaign.Client.Models.Enums;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.CustomerProfile.Client.Models.Enums;
-using Lykke.Service.CustomerProfile.Client.Models.Responses;
-using Lykke.Service.NotificationSystem.SubscriberContract;
-using Lykke.Service.PrivateBlockchainFacade.Client;
-using Lykke.Service.PrivateBlockchainFacade.Client.Models;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.Campaign.Client.Models.Campaign.Responses;
+using MAVN.Service.Campaign.Client.Models.Enums;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client.Models.Enums;
+using MAVN.Service.CustomerProfile.Client.Models.Responses;
+using MAVN.Service.NotificationSystem.SubscriberContract;
+using MAVN.Service.PrivateBlockchainFacade.Client;
+using MAVN.Service.PrivateBlockchainFacade.Client.Models;
 using MAVN.Service.Staking.Domain.Enums;
 using MAVN.Service.Staking.Domain.Models;
 using MAVN.Service.Staking.Domain.Repositories;
 using MAVN.Service.Staking.Domain.Services;
 using MAVN.Service.Staking.DomainServices.Services;
 using MAVN.Service.Staking.MsSqlRepositories;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
-using Lykke.Service.WalletManagement.Client.Models.Responses;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
+using MAVN.Service.WalletManagement.Client.Models.Responses;
 using Moq;
 using Xunit;