Implement new collectibles API

NightHack36 · Aug 6, 2018 · 5668e6a · 5668e6a
1 parent c283f2e
commit 5668e6a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Trust/Core/Network/TrustNetwork.swift b/Trust/Core/Network/TrustNetwork.swift
@@ -16,7 +16,7 @@ enum TrustNetworkProtocolError: LocalizedError {
 }
 
 protocol NetworkProtocol: TrustNetworkProtocol {
-    func assets(for address: Address) -> Promise<[NonFungibleTokenCategory]>
+    func collectibles() -> Promise<[NonFungibleTokenCategory]>
     func tickers(with tokenPrices: [TokenPrice]) -> Promise<[CoinTicker]>
 
     func tokensList() -> Promise<[TokenObject]>
@@ -100,9 +100,9 @@ final class TrustNetwork: NetworkProtocol {
         }
     }
 
-    func assets(for address: Address) -> Promise<[NonFungibleTokenCategory]> {
+    func collectibles() -> Promise<[NonFungibleTokenCategory]> {
         return Promise { seal in
-            provider.request(.assets(address: address.description)) { result in
+            provider.request(.collectibles(dict)) { result in
                 switch result {
                 case .success(let response):
                     do {

diff --git a/Trust/EtherClient/TrustClient/TrustAPI.swift b/Trust/EtherClient/TrustClient/TrustAPI.swift
@@ -10,7 +10,7 @@ enum TrustAPI {
     case prices(TokensPrice)
     case getAllTransactions(addresses: [String: String])
     case search(query: String, networks: [Int])
-    case assets(address: String)
+    case collectibles([String: [String]])
     case getTokens([String: [String]])
     case register(device: PushDevice)
     case unregister(device: PushDevice)
@@ -34,8 +34,8 @@ extension TrustAPI: TargetType {
             return "/notifications/register"
         case .unregister:
             return "/notifications/unregister"
-        case .assets:
-            return "/assets"
+        case .collectibles:
+            return "/collectibles"
         case .search:
             return "/tokens/list"
         }
@@ -49,7 +49,7 @@ extension TrustAPI: TargetType {
         case .getAllTransactions: return .post
         case .register: return .post
         case .unregister: return .post
-        case .assets: return .get
+        case .collectibles: return .post
         case .search: return .get
         }
     }
@@ -66,14 +66,12 @@ extension TrustAPI: TargetType {
             return .requestParameters(parameters: params, encoding: URLEncoding())
         case .getAllTransactions(let addresses):
             return .requestParameters(parameters: ["address": addresses], encoding: URLEncoding())
-        case .getTokens(let value):
-            return .requestJSONEncodable(value)
         case .register(let device):
             return .requestJSONEncodable(device)
         case .unregister(let device):
             return .requestJSONEncodable(device)
-        case .assets(let value):
-            return .requestParameters(parameters: ["address": value], encoding: URLEncoding())
+        case .collectibles(let value), .getTokens(let value):
+            return .requestJSONEncodable(value)
         case .search(let query, let networks):
             let networkString =  networks.map { String($0) }.joined(separator: ",")
             return .requestParameters(parameters: ["query": query, "networks": networkString], encoding: URLEncoding())

diff --git a/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift b/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift
@@ -61,7 +61,7 @@ final class NonFungibleTokenViewModel {
     func fetchAssets() -> Promise<[NonFungibleTokenCategory]> {
         return Promise { seal in
             firstly {
-                tokensNetwork.assets(for: self.address)
+                tokensNetwork.collectibles()
             }.done { [weak self] tokens in
                 self?.storage.add(tokens: tokens)
                 seal.fulfill(tokens)