Merge pull request #7 from HannaAndreevna/clean-up-falcon-dependencie…

…s-blockchain-load-testing Replace nuget packages from Lykke and Falcon to MAVN
OpenMAVN · May 12, 2020 · a9ca004 · a9ca004
2 parents 901b724 + 89ae583
commit a9ca004
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 40 deletions.
diff --git a/src/MAVN.Job.BlockchainLoadTesting.DomainServices/DataGenerator.cs b/src/MAVN.Job.BlockchainLoadTesting.DomainServices/DataGenerator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -7,28 +7,23 @@
 using Lykke.Common.Log;
 using MAVN.Job.BlockchainLoadTesting.Domain.Services;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.Campaign.Client.Models.BurnRule.Requests;
-using Lykke.Service.CustomerManagement.Client;
-using Lykke.Service.CustomerManagement.Client.Models.Requests;
-using Lykke.Service.CustomerManagement.Contract.Events;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.CustomerProfile.Client.Models.Enums;
-using Lykke.Service.CustomerProfile.Client.Models.Requests;
-using Lykke.Service.PartnerManagement.Client.Models;
-using Lykke.Service.PaymentTransfers.Client;
-using Lykke.Service.PaymentTransfers.Client.Models.Requests;
-using Lykke.Service.WalletManagement.Client;
-using Lykke.Service.WalletManagement.Client.Enums;
-using Lykke.Service.WalletManagement.Client.Models.Requests;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerManagement.Client;
+using MAVN.Service.CustomerManagement.Client.Models.Requests;
+using MAVN.Service.CustomerManagement.Contract.Events;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.CustomerProfile.Client.Models.Enums;
+using MAVN.Service.CustomerProfile.Client.Models.Requests;
+using MAVN.Service.WalletManagement.Client;
+using MAVN.Service.WalletManagement.Client.Enums;
+using MAVN.Service.WalletManagement.Client.Models.Requests;
 
 namespace MAVN.Job.BlockchainLoadTesting.DomainServices
 {
     public class DataGenerator : IDataGenerator
     {
         private readonly ICampaignClient _campaignClient;
         private readonly ICustomerManagementServiceClient _customerManagementServiceClient;
-        private readonly IPaymentTransfersClient _paymentTransfersClient;
         private readonly IWalletManagementClient _walletManagementClient;
         private readonly ICustomerProfileClient _customerProfileClient;
         private readonly IRabbitPublisher<EmailCodeVerifiedEvent> _emailVerifiedPublisher;
@@ -37,15 +32,13 @@ public class DataGenerator : IDataGenerator
         public DataGenerator(
             ICampaignClient campaignClient,
             ICustomerManagementServiceClient customerManagementServiceClient,
-            IPaymentTransfersClient paymentTransfersClient,
             IWalletManagementClient walletManagementClient,
             ICustomerProfileClient customerProfileClient,
             IRabbitPublisher<EmailCodeVerifiedEvent> emailVerifiedPublisher,
             ILogFactory logFactory)
         {
             _campaignClient = campaignClient;
             _customerManagementServiceClient = customerManagementServiceClient;
-            _paymentTransfersClient = paymentTransfersClient;
             _walletManagementClient = walletManagementClient;
             _customerProfileClient = customerProfileClient;
             _emailVerifiedPublisher = emailVerifiedPublisher;

diff --git a/...BlockchainLoadTesting.DomainServices/MAVN.Job.BlockchainLoadTesting.DomainServices.csproj b/...BlockchainLoadTesting.DomainServices/MAVN.Job.BlockchainLoadTesting.DomainServices.csproj
@@ -4,13 +4,12 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Falcon.Service.Campaign.Client" Version="7.4.0" />
-    <PackageReference Include="Falcon.Service.CustomerManagement.Client" Version="8.5.0" />
-    <PackageReference Include="Falcon.Service.CustomerManagement.Contract" Version="6.0.0" />
-    <PackageReference Include="Falcon.Service.CustomerProfile.Client" Version="7.7.0" />
-    <PackageReference Include="Falcon.Service.PaymentTransfers.Client" Version="3.0.0" />
-    <PackageReference Include="Falcon.Service.WalletManagement.Client" Version="3.5.0" />
     <PackageReference Include="Lykke.RabbitMqBroker" Version="7.12.0" />
+    <PackageReference Include="MAVN.Service.Campaign.Client" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.CustomerManagement.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.CustomerManagement.Contract" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.2.0" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Job.BlockchainLoadTesting.Domain\MAVN.Job.BlockchainLoadTesting.Domain.csproj" />

diff --git a/src/MAVN.Job.BlockchainLoadTesting/Modules/JobModule.cs b/src/MAVN.Job.BlockchainLoadTesting/Modules/JobModule.cs
@@ -1,17 +1,16 @@
-using Autofac;
+using Autofac;
 using Common;
 using JetBrains.Annotations;
 using MAVN.Job.BlockchainLoadTesting.Domain.Services;
 using MAVN.Job.BlockchainLoadTesting.DomainServices;
 using MAVN.Job.BlockchainLoadTesting.Services;
 using MAVN.Job.BlockchainLoadTesting.Settings;
 using Lykke.RabbitMqBroker.Publisher;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerManagement.Client;
-using Lykke.Service.CustomerManagement.Contract.Events;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PaymentTransfers.Client;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerManagement.Client;
+using MAVN.Service.CustomerManagement.Contract.Events;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.WalletManagement.Client;
 using Lykke.SettingsReader;
 using Lykke.Sdk;
 using Lykke.Sdk.Health;
@@ -57,7 +56,6 @@ protected override void Load(ContainerBuilder builder)
 
             builder.RegisterCampaignClient(_appSettings.CampaignServiceClient);
             builder.RegisterCustomerManagementClient(_appSettings.CustomerManagementServiceClient, null);
-            builder.RegisterPaymentTransfersClient(_appSettings.PaymentTransfersServiceClient, null);
             builder.RegisterWalletManagementClient(_appSettings.WalletManagementServiceClient, null);
             builder.RegisterCustomerProfileClient(_appSettings.CustomerProfileServiceClient);
         }

diff --git a/src/MAVN.Job.BlockchainLoadTesting/Settings/AppSettings.cs b/src/MAVN.Job.BlockchainLoadTesting/Settings/AppSettings.cs
@@ -1,10 +1,9 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using MAVN.Job.BlockchainLoadTesting.Settings.JobSettings;
-using Lykke.Service.Campaign.Client;
-using Lykke.Service.CustomerManagement.Client;
-using Lykke.Service.CustomerProfile.Client;
-using Lykke.Service.PaymentTransfers.Client;
-using Lykke.Service.WalletManagement.Client;
+using MAVN.Service.Campaign.Client;
+using MAVN.Service.CustomerManagement.Client;
+using MAVN.Service.CustomerProfile.Client;
+using MAVN.Service.WalletManagement.Client;
 using Lykke.Sdk.Settings;
 
 namespace MAVN.Job.BlockchainLoadTesting.Settings
@@ -18,8 +17,6 @@ public class AppSettings : BaseAppSettings
 
         public CustomerManagementServiceClientSettings CustomerManagementServiceClient { get; set; }
 
-        public PaymentTransfersServiceClientSettings PaymentTransfersServiceClient { get; set; }
-
         public WalletManagementServiceClientSettings WalletManagementServiceClient { get; set; }
 
         public CustomerProfileServiceClientSettings CustomerProfileServiceClient { get; set; }