Merge pull request #42 from torusresearch/feat/migration-changes

minor changes related to migration
torusresearch · Nov 1, 2023 · d591af5 · d591af5
2 parents 4a887d3 + 2311512
commit d591af5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 36 deletions.
diff --git a/Sources/CommonSources/Models/AllNodeDetailsModel.swift b/Sources/CommonSources/Models/AllNodeDetailsModel.swift
@@ -117,14 +117,14 @@ public struct AllNodeDetailsModel:Equatable, Decodable {
         self.torusNodeTSSEndpoints = torusNodeTSSEndpoints
     }
 
-    public mutating func setNodeDetails(nodeDetails: AllNodeDetailsModel) {
+    public mutating func setNodeDetails(nodeDetails: AllNodeDetailsModel, updated: Bool) {
         self.torusNodeEndpoints = nodeDetails.torusNodeEndpoints
         self.torusNodeSSSEndpoints = nodeDetails.torusNodeSSSEndpoints
         self.torusNodeRSSEndpoints = nodeDetails.torusNodeRSSEndpoints
         self.torusNodeTSSEndpoints = nodeDetails.torusNodeTSSEndpoints
         self.torusNodePub = nodeDetails.torusNodePub
         self.torusIndexes = nodeDetails.torusIndexes
         self.currentEpoch = nodeDetails.currentEpoch
-        self.updated = true
+        self.updated = updated
     }
 }
diff --git a/Sources/FetchNodeDetails/Constants/Constants.swift b/Sources/FetchNodeDetails/Constants/Constants.swift
@@ -11,7 +11,7 @@ let TORUS_NETWORK: [TorusNetwork: String] = [
 public typealias TORUS_NETWORK_TYPE = String
 
 
-let MULTI_CLUSTER_NETWORKS: [LegacyNetwork] = [ .AQUA, .CELESTE, .CYAN ]
+let MULTI_CLUSTER_NETWORKS: [LegacyNetwork] = [.CELESTE]
 
 let NETWORK_MAP: [LegacyNetwork: String] = [
     .MAINNET: "mainnet",

diff --git a/Sources/FetchNodeDetails/NodeDetailManager.swift b/Sources/FetchNodeDetails/NodeDetailManager.swift
@@ -57,13 +57,13 @@ open class NodeDetailManager {
             let (data, _) = try await URLSession.shared.data(from: url)
             let response = try JSONDecoder().decode(NodeDetailsResponse.self, from: data)
             let nodeDetails = response.getNodeDetails()
-            fndResult.setNodeDetails(nodeDetails: nodeDetails)
+            fndResult.setNodeDetails(nodeDetails: nodeDetails, updated: true)
             return fndResult
         } catch let error {
             os_log("Failed to fetch node details from server, using local. %s", log: getTorusLogger(log: FNDLogger.core, type: .error), type: .error, error.localizedDescription)
         }
         let nodeDetails = try fetchLocalConfig(network: self.network)!
-        fndResult.setNodeDetails(nodeDetails: nodeDetails)
+        fndResult.setNodeDetails(nodeDetails: nodeDetails, updated: false)
         return fndResult
     }
 

diff --git a/Sources/FndBase/Configs/LegacyConfig.swift b/Sources/FndBase/Configs/LegacyConfig.swift
diff --git a/Sources/FndBase/Utils/Utils.swift b/Sources/FndBase/Utils/Utils.swift
@@ -7,7 +7,6 @@ public func fetchLocalConfig(network: TorusNetwork) throws -> AllNodeDetailsMode
         if (network.migration_map.migrationCompleted) {
             return try SapphireConfig(network: network.migration_map.networkMigratedTo )
         }
-        if (network == LegacyNetwork.MAINNET ) { return NODE_DETAILS_MAINNET }
         return nil
 
         case .sapphire(let network) :