Add TrustAPI provider

mishfit · Jun 4, 2018 · 43e7fe5 · 43e7fe5
1 parent 3d1fa97
commit 43e7fe5
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 25 deletions.
diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj
@@ -390,6 +390,7 @@
 		77872D322027AA4A0032D687 /* SliderTextFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77872D312027AA4A0032D687 /* SliderTextFieldRow.swift */; };
 		778EA5FD2050A5ED00E81F7F /* WalletTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778EA5FC2050A5ED00E81F7F /* WalletTests.swift */; };
 		778EAF7D1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */; };
+		77A6D8A120C4DE06000A9ADC /* TrustAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A6D8A020C4DE06000A9ADC /* TrustAPI.swift */; };
 		77B1EAFF20639DEB007970AA /* NFTokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EAFE20639DEB007970AA /* NFTokenViewController.swift */; };
 		77B1EB012063A198007970AA /* NFTDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EB002063A198007970AA /* NFTDetailsViewModel.swift */; };
 		77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */; };
@@ -872,6 +873,7 @@
 		778EA5FC2050A5ED00E81F7F /* WalletTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletTests.swift; sourceTree = "<group>"; };
 		778EAF7C1FF10AF400C8E2AB /* SettingsCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCoordinatorTests.swift; sourceTree = "<group>"; };
 		779891EA207C10C7008890B8 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		77A6D8A020C4DE06000A9ADC /* TrustAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustAPI.swift; sourceTree = "<group>"; };
 		77B1EAFE20639DEB007970AA /* NFTokenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFTokenViewController.swift; sourceTree = "<group>"; };
 		77B1EB002063A198007970AA /* NFTDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFTDetailsViewModel.swift; sourceTree = "<group>"; };
 		77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmCoordinator.swift; sourceTree = "<group>"; };
@@ -1299,6 +1301,7 @@
 			children = (
 				29ED26EB1FB0069B00F7F8F9 /* Models */,
 				2959961B1FAE3EDF00DB66A8 /* TrustClient.swift */,
+				77A6D8A020C4DE06000A9ADC /* TrustAPI.swift */,
 			);
 			path = TrustClient;
 			sourceTree = "<group>";
@@ -3204,6 +3207,7 @@
 				777871312082DF3D00CF7303 /* GetTransactionReceiptRequest.swift in Sources */,
 				77B64101209668FF00BEF3EB /* EtherNumberFormatter+Trust.swift in Sources */,
 				776C114C20605AAC00449539 /* TokensLayout.swift in Sources */,
+				77A6D8A120C4DE06000A9ADC /* TrustAPI.swift in Sources */,
 				73ED85A520349BE400593BF3 /* StringFormatter.swift in Sources */,
 				BB8E747920818E5E001BA99A /* SearchTokenResultsController.swift in Sources */,
 				293112101FC4ADCB00966EEA /* InCoordinatorViewModel.swift in Sources */,

diff --git a/Trust/Core/Network/TrustNetwork.swift b/Trust/Core/Network/TrustNetwork.swift
@@ -26,16 +26,23 @@ protocol NetworkProtocol: TrustNetworkProtocol {
 }
 
 class TrustNetwork: NetworkProtocol {
-
     static let deleteMissingInternalSeconds: Double = 60.0
     static let deleyedTransactionInternalSeconds: Double = 60.0
     let provider: MoyaProvider<TrustService>
+    let APIProvider: MoyaProvider<TrustAPI>
     let config: Config
     let balanceService: TokensBalanceService
     let account: Wallet
 
-    required init(provider: MoyaProvider<TrustService>, balanceService: TokensBalanceService, account: Wallet, config: Config) {
+    required init(
+        provider: MoyaProvider<TrustService>,
+        APIProvider: MoyaProvider<TrustAPI>,
+        balanceService: TokensBalanceService,
+        account: Wallet,
+        config: Config
+    ) {
         self.provider = provider
+        self.APIProvider = APIProvider
         self.balanceService = balanceService
         self.account = account
         self.config = config
@@ -46,7 +53,7 @@ class TrustNetwork: NetworkProtocol {
             currency: config.currency.rawValue,
             tokens: tokenPrices
         )
-        provider.request(.prices(tokensPriceToFetch)) { result in
+        APIProvider.request(.prices(tokensPriceToFetch)) { result in
             guard case .success(let response) = result else {
                 completion(nil)
                 return
@@ -133,7 +140,7 @@ class TrustNetwork: NetworkProtocol {
                 currency: config.currency.rawValue,
                 tokens: tokenPrices
             )
-            provider.request(.prices(tokensPriceToFetch)) { result in
+            APIProvider.request(.prices(tokensPriceToFetch)) { result in
                 guard case .success(let response) = result else {
                     seal.reject(TrustNetworkProtocolError.missingPrices)
                     return

diff --git a/Trust/EtherClient/TrustClient/TrustAPI.swift b/Trust/EtherClient/TrustClient/TrustAPI.swift
@@ -0,0 +1,55 @@
+// Copyright SIX DAY LLC. All rights reserved.
+
+import Foundation
+import Moya
+
+enum TrustAPI {
+    case prices(TokensPrice)
+}
+
+struct TokensPrice: Encodable {
+    let currency: String
+    let tokens: [TokenPrice]
+}
+
+struct TokenPrice: Encodable {
+    let contract: String
+    let symbol: String
+}
+
+extension TrustAPI: TargetType {
+
+    var baseURL: URL { return Constants.trustAPI }
+
+    var path: String {
+        switch self {
+        case .prices:
+            return "/tokenPrices"
+        }
+    }
+
+    var method: Moya.Method {
+        switch self {
+        case .prices: return .post
+        }
+    }
+
+    var task: Task {
+        switch self {
+        case .prices(let tokensPrice):
+            return .requestJSONEncodable(tokensPrice)
+        }
+    }
+
+    var sampleData: Data {
+        return Data()
+    }
+
+    var headers: [String: String]? {
+        return [
+            "Content-type": "application/json",
+            "client": Bundle.main.bundleIdentifier ?? "",
+            "client-build": Bundle.main.buildNumber ?? "",
+        ]
+    }
+}
diff --git a/Trust/EtherClient/TrustClient/TrustClient.swift b/Trust/EtherClient/TrustClient/TrustClient.swift
@@ -4,7 +4,6 @@ import Foundation
 import Moya
 
 enum TrustService {
-    case prices(TokensPrice)
     case getTransactions(address: String, startBlock: Int, page: Int, contract: String?)
     case getTokens(address: String, showBalance: Bool)
     case getTransaction(ID: String)
@@ -15,16 +14,6 @@ enum TrustService {
     case search(token: String)
 }
 
-struct TokensPrice: Encodable {
-    let currency: String
-    let tokens: [TokenPrice]
-}
-
-struct TokenPrice: Encodable {
-    let contract: String
-    let symbol: String
-}
-
 extension TrustService: TargetType {
 
     var baseURL: URL { return Config().server.remoteURL }
@@ -41,8 +30,6 @@ extension TrustService: TargetType {
             return "/push/register"
         case .unregister:
             return "/push/unregister"
-        case .prices:
-            return "/tokenPrices"
         case .marketplace:
             return "/marketplace"
         case .assets:
@@ -59,7 +46,6 @@ extension TrustService: TargetType {
         case .getTransaction: return .get
         case .register: return .post
         case .unregister: return .delete
-        case .prices: return .post
         case .marketplace: return .get
         case .assets: return .get
         case .search: return .get
@@ -85,8 +71,6 @@ extension TrustService: TargetType {
             return .requestJSONEncodable(device)
         case .unregister(let device):
             return .requestJSONEncodable(device)
-        case .prices(let tokensPrice):
-            return .requestJSONEncodable(tokensPrice)
         case .marketplace(let chainID):
             return .requestParameters(parameters: ["chainID": chainID], encoding: URLEncoding())
         case .assets(let address):

diff --git a/Trust/Foundation/TrustNetworkProtocol.swift b/Trust/Foundation/TrustNetworkProtocol.swift
@@ -4,8 +4,9 @@ import Moya
 
 protocol TrustNetworkProtocol {
     var provider: MoyaProvider<TrustService> { get }
+    var APIProvider: MoyaProvider<TrustAPI> { get }
     var balanceService: TokensBalanceService { get }
     var account: Wallet { get }
     var config: Config { get }
-    init(provider: MoyaProvider<TrustService>, balanceService: TokensBalanceService, account: Wallet, config: Config)
+    init(provider: MoyaProvider<TrustService>, APIProvider: MoyaProvider<TrustAPI>, balanceService: TokensBalanceService, account: Wallet, config: Config)
 }
diff --git a/Trust/InCoordinator.swift b/Trust/InCoordinator.swift
@@ -85,7 +85,13 @@ class InCoordinator: Coordinator {
         let tokensStorage = TokensDataStore(realm: realm, config: config)
         let balanceCoordinator =  TokensBalanceService()
         let viewModel = InCoordinatorViewModel(config: config)
-        let trustNetwork = TrustNetwork(provider: TrustProviderFactory.makeProvider(), balanceService: balanceCoordinator, account: account, config: config)
+        let trustNetwork = TrustNetwork(
+            provider: TrustProviderFactory.makeProvider(),
+            APIProvider: TrustProviderFactory.makeAPIProvider(),
+            balanceService: balanceCoordinator,
+            account: account,
+            config: config
+        )
         let balance =  BalanceCoordinator(account: account, config: config, storage: tokensStorage)
         let transactionsStorage = TransactionsStorage(
             realm: realm,

diff --git a/Trust/Settings/Types/Constants.swift b/Trust/Settings/Types/Constants.swift
@@ -23,6 +23,8 @@ public struct Constants {
     public static let dappsOpenSea = "https://opensea.io"
 
     public static let images = "https://trustwalletapp.com/images"
+
+    public static let trustAPI = URL(string: "https://public.trustwalletapp.com")!
 }
 
 public struct UnitConfiguration {

diff --git a/Trust/Transactions/Coordinators/TrustProvider.swift b/Trust/Transactions/Coordinators/TrustProvider.swift
@@ -22,4 +22,12 @@ struct TrustProviderFactory {
         )
         return MoyaProvider<TrustService>(manager: manager)
     }
+
+    static func makeAPIProvider() -> MoyaProvider<TrustAPI> {
+        let manager = Manager(
+            configuration: URLSessionConfiguration.default,
+            serverTrustPolicyManager: ServerTrustPolicyManager(policies: policies)
+        )
+        return MoyaProvider<TrustAPI>(manager: manager)
+    }
 }
diff --git a/TrustTests/Coordinators/TokensCoordinatorTests.swift b/TrustTests/Coordinators/TokensCoordinatorTests.swift
@@ -11,7 +11,13 @@ class TokensCoordinatorTests: XCTestCase {
             session: .make(),
             keystore: FakeKeystore(),
             tokensStorage: FakeTokensDataStore(),
-            network: FakeTokensNetwork(provider: TrustProviderFactory.makeProvider(), balanceService: FakeGetBalanceCoordinator(), account: .make(), config: .make()), transactionsStore: FakeTransactionsStorage()
+            network: FakeTokensNetwork(
+                provider: TrustProviderFactory.makeProvider(),
+                APIProvider: TrustProviderFactory.makeAPIProvider(),
+                balanceService: FakeGetBalanceCoordinator(),
+                account: .make(),
+                config: .make()
+            ), transactionsStore: FakeTransactionsStorage()
         )
 
         coordinator.start()

diff --git a/TrustTests/Factories/FakeTokensNetwork.swift b/TrustTests/Factories/FakeTokensNetwork.swift
@@ -17,12 +17,14 @@ enum FakeTokensNetworkError: Error {
 class FakeTokensNetwork: NetworkProtocol {
 
     var provider: MoyaProvider<TrustService>
+    var APIProvider: MoyaProvider<TrustAPI>
     var balanceService: TokensBalanceService
     var account: Trust.Wallet
     var config: Config
 
-    required init(provider: MoyaProvider<TrustService>, balanceService: TokensBalanceService, account: Trust.Wallet, config: Config) {
+    required init(provider: MoyaProvider<TrustService>, APIProvider: MoyaProvider<TrustAPI>, balanceService: TokensBalanceService, account: Trust.Wallet, config: Config) {
         self.provider = provider
+        self.APIProvider = APIProvider
         self.balanceService = balanceService
         self.account = account
         self.config = config

diff --git a/TrustTests/Tokens/TokensViewModelTest.swift b/TrustTests/Tokens/TokensViewModelTest.swift
@@ -5,7 +5,7 @@ import XCTest
 import BigInt
 
 class TokensViewModelTest: XCTestCase {
-    let model = TokensViewModel(address: .make(), store: FakeTokensDataStore(), tokensNetwork: FakeTokensNetwork(provider: TrustProviderFactory.makeProvider(), balanceService: FakeGetBalanceCoordinator(), account: .make(), config: .make()))
+    let model = TokensViewModel(address: .make(), store: FakeTokensDataStore(), tokensNetwork: FakeTokensNetwork(provider: TrustProviderFactory.makeProvider(), APIProvider: TrustProviderFactory.makeAPIProvider(), balanceService: FakeGetBalanceCoordinator(), account: .make(), config: .make()))
     let firstItem = IndexPath(row: 0, section: 0)
 
     func testNumberOfTokens() {