Update configs

atomex-me · Jul 12, 2021 · 1642e01 · 1642e01
1 parent 553a22b
commit 1642e01
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 21 deletions.
diff --git a/Atomex.Client.Core b/Atomex.Client.Core
diff --git a/Atomex.Client.Wpf/App.xaml.cs b/Atomex.Client.Wpf/App.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
@@ -13,7 +14,7 @@
 using Atomex.Core;
 using Atomex.MarketData.Bitfinex;
 using Atomex.Updates;
-using Atomex.Subsystems;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf
 {
@@ -35,10 +36,20 @@ public partial class App
             .GetAssemblies()
             .FirstOrDefault(a => a.GetName().Name == "Atomex.Client.Core");
 
-        private static IConfiguration CurrenciesConfiguration { get; } = new ConfigurationBuilder()
-            .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
-            .AddEmbeddedJsonFile(CoreAssembly, "currencies.json")
-            .Build();
+        private static string CurrenciesConfigurationJson
+        {
+            get
+            {
+                var coreAssembly  = CoreAssembly;
+                var resourceName  = "currencies.json";
+                var resourceNames = coreAssembly.GetManifestResourceNames();
+                var fullFileName  = resourceNames.FirstOrDefault(n => n.EndsWith(resourceName));
+                var stream = coreAssembly.GetManifestResourceStream(fullFileName!);
+
+                using StreamReader reader = new(stream!);
+                return reader.ReadToEnd();
+            }
+        }
 
         private static IConfiguration SymbolsConfiguration { get; } = new ConfigurationBuilder()
             .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
@@ -68,7 +79,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             Log.Information("Application startup");
 
-            var currenciesProvider = new CurrenciesProvider(CurrenciesConfiguration);
+            var currenciesProvider = new CurrenciesProvider(CurrenciesConfigurationJson);
             var symbolsProvider = new SymbolsProvider(SymbolsConfiguration);
 
             // init Atomex client app

diff --git a/Atomex.Client.Wpf/Common/DesignTime.cs b/Atomex.Client.Wpf/Common/DesignTime.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Linq;
 using System.Reflection;
+
+using Microsoft.Extensions.Configuration;
+
 using Atomex.Abstract;
 using Atomex.Common.Configuration;
 using Atomex.Core;
-using Microsoft.Extensions.Configuration;
 
 namespace Atomex.Client.Wpf.Common
 {
@@ -24,10 +26,7 @@ public static class DesignTime
             .Build()
             .GetSection(Network.TestNet.ToString());
 
-        public static readonly ICurrencies Currencies 
-            = new Currencies(CurrenciesConfiguration);
-
-        public static readonly ISymbols Symbols 
-            = new Symbols(SymbolsConfiguration);
+        public static ICurrencies Currencies => new Currencies(CurrenciesConfiguration);
+        public static ISymbols Symbols => new Symbols(SymbolsConfiguration);
     }
 }
diff --git a/Atomex.Client.Wpf/ViewModels/BuyWithCardViewModel.cs b/Atomex.Client.Wpf/ViewModels/BuyWithCardViewModel.cs
@@ -9,8 +9,8 @@
 using Atomex.Client.Wpf.ViewModels.Abstract;
 using Atomex.Client.Wpf.ViewModels.CurrencyViewModels;
 using Atomex.Core;
-using Atomex.Subsystems;
 using Atomex.Wallet.Abstract;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf.ViewModels
 {

diff --git a/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs b/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs
@@ -14,14 +14,14 @@
 using Atomex.Core;
 using Atomex.MarketData;
 using Atomex.MarketData.Abstract;
-using Atomex.Subsystems;
 using Atomex.Swaps;
 using Atomex.Client.Wpf.Common;
 using Atomex.Client.Wpf.Controls;
 using Atomex.Client.Wpf.Properties;
 using Atomex.Client.Wpf.ViewModels.Abstract;
 using Atomex.Client.Wpf.ViewModels.CurrencyViewModels;
 using Atomex.Swaps.Helpers;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf.ViewModels
 {

diff --git a/Atomex.Client.Wpf/ViewModels/MainViewModel.cs b/Atomex.Client.Wpf/ViewModels/MainViewModel.cs
@@ -16,11 +16,11 @@
 using Atomex.Common;
 using Atomex.MarketData;
 using Atomex.MarketData.Abstract;
-using Atomex.Subsystems;
-using Atomex.Subsystems.Abstract;
 using Atomex.Updates;
 using Atomex.Wallet;
 using Atomex.Wallet.Abstract;
+using Atomex.Services.Abstract;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf.ViewModels
 {

diff --git a/Atomex.Client.Wpf/ViewModels/MyWalletsViewModel.cs b/Atomex.Client.Wpf/ViewModels/MyWalletsViewModel.cs
@@ -6,7 +6,7 @@
 using Atomex.Client.Wpf.Controls;
 using Atomex.Common;
 using Atomex.Core;
-using Atomex.Subsystems;
+using Atomex.Services;
 using Atomex.Wallet;
 using Atomex.Wallet.Abstract;
 

diff --git a/Atomex.Client.Wpf/ViewModels/PortfolioViewModel.cs b/Atomex.Client.Wpf/ViewModels/PortfolioViewModel.cs
@@ -4,14 +4,14 @@
 using System.Linq;
 using System.Windows.Media;
 using Atomex.Common;
-using Atomex.Subsystems;
 using Atomex.Client.Wpf.Common;
 using Atomex.Client.Wpf.ViewModels.Abstract;
 using OxyPlot;
 using OxyPlot.Series;
 using OxyPlot.Wpf;
 using PieSeries = OxyPlot.Series.PieSeries;
 using Atomex.Client.Wpf.ViewModels.CurrencyViewModels;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf.ViewModels
 {

diff --git a/Atomex.Client.Wpf/ViewModels/StartViewModel.cs b/Atomex.Client.Wpf/ViewModels/StartViewModel.cs
@@ -5,7 +5,7 @@
 
 using Atomex.Client.Wpf.Common;
 using Atomex.Client.Wpf.Controls;
-using Atomex.Subsystems;
+using Atomex.Services;
 using Atomex.Wallet.Abstract;
 
 namespace Atomex.Client.Wpf.ViewModels

diff --git a/Atomex.Client.Wpf/ViewModels/WalletsViewModel.cs b/Atomex.Client.Wpf/ViewModels/WalletsViewModel.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Atomex.Subsystems;
 using Atomex.Client.Wpf.Common;
 using Atomex.Client.Wpf.Controls;
 using Atomex.Client.Wpf.ViewModels.Abstract;
 using Atomex.Client.Wpf.ViewModels.CurrencyViewModels;
 using Atomex.Client.Wpf.ViewModels.WalletViewModels;
+using Atomex.Services;
 
 namespace Atomex.Client.Wpf.ViewModels
 {
+2 −2		Atomex.Client.Core/AtomexApp.cs
+1 −0		Atomex.Client.Core/Core/Currency.cs
+1 −0		Atomex.Client.Core/Currencies/Abstract/ICurrenciesProvider.cs
+2 −1		Atomex.Client.Core/Currencies/Bitcoin.cs
+1 −1		Atomex.Client.Core/Currencies/Currencies.cs
+82 −1		Atomex.Client.Core/Currencies/CurrenciesProvider.cs
+1 −0		Atomex.Client.Core/Currencies/Ethereum.cs
+1 −0		Atomex.Client.Core/Currencies/EthereumTokens/ERC20.cs
+1 −0		Atomex.Client.Core/Currencies/Litecoin.cs
+1 −0		Atomex.Client.Core/Currencies/Tezos.cs
+1 −0		Atomex.Client.Core/Currencies/TezosTokens/FA12.cs
+1 −0		Atomex.Client.Core/Currencies/TezosTokens/FA2.cs
+1 −0		Atomex.Client.Core/Currencies/TezosTokens/NYX.cs
+2 −2		Atomex.Client.Core/IAtomexApp.cs
+1 −1		Atomex.Client.Core/LiteDb/LiteDbAccountDataRepository.cs
+4 −4		Atomex.Client.Core/LiteDb/LiteDbMigrationManager.cs
+6 −6		Atomex.Client.Core/LiteDb/LiteDbMigrations.cs
+1 −1		Atomex.Client.Core/Services/Abstract/IAtomexClient.cs
+1 −1		Atomex.Client.Core/Services/Abstract/ICurrenciesUpdater.cs
+1 −1		Atomex.Client.Core/Services/Abstract/ISymbolsUpdater.cs
+7 −5		Atomex.Client.Core/Services/CurrenciesUpdater.cs
+4 −3		Atomex.Client.Core/Services/SymbolsUpdater.cs
+3 −2		Atomex.Client.Core/Services/TerminalChangedEventArgs.cs
+1 −1		Atomex.Client.Core/Services/TerminalErrorEventArgs.cs
+1 −1		Atomex.Client.Core/Services/TerminalService.cs
+1 −1		Atomex.Client.Core/Services/TerminalServiceEventArgs.cs
+16 −15		Atomex.Client.Core/Services/WebSocketAtomexClient.cs
+1 −1		Atomex.Client.Core/ViewModels/Helpers.cs
+149 −451		Atomex.Client.Core/currencies.json