Skip to content

Commit

Permalink
Merge pull request #41 from torusresearch/update_network_migrations
Browse files Browse the repository at this point in the history
feat: update migration status for cyan and aqua networks
  • Loading branch information
chaitanyapotti authored Nov 1, 2023
2 parents 68459eb + 1269478 commit 4a887d3
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 128 deletions.
4 changes: 2 additions & 2 deletions Sources/CommonSources/TorusNetwork.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ public enum LegacyNetwork: Equatable, Hashable {
case .TESTNET:
return LegacyNetworkMigrationInfo(migrationCompleted: true, networkIdentifier: "teal", networkMigratedTo: SapphireNetwork.SAPPHIRE_DEVNET)
case .CYAN :
return LegacyNetworkMigrationInfo(migrationCompleted: false, networkIdentifier: self.name, networkMigratedTo: SapphireNetwork.SAPPHIRE_MAINNET)
return LegacyNetworkMigrationInfo(migrationCompleted: true, networkIdentifier: self.name, networkMigratedTo: SapphireNetwork.SAPPHIRE_MAINNET)
case .AQUA :
return LegacyNetworkMigrationInfo(migrationCompleted: false, networkIdentifier: self.name, networkMigratedTo: SapphireNetwork.SAPPHIRE_MAINNET)
return LegacyNetworkMigrationInfo(migrationCompleted: true, networkIdentifier: self.name, networkMigratedTo: SapphireNetwork.SAPPHIRE_MAINNET)
case .CELESTE:
return LegacyNetworkMigrationInfo(migrationCompleted: false, networkIdentifier: self.name, networkMigratedTo: SapphireNetwork.SAPPHIRE_MAINNET)
case .CUSTOM(_):
Expand Down
101 changes: 36 additions & 65 deletions Tests/FetchNodeDetailsTests/SampleOutput.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import BigInt
@testable import CommonSources
@testable import FetchNodeDetails
@testable import FndBase
@testable import CommonSources

import XCTest


public struct SampleOutputMainnet {
var val: AllNodeDetailsModel {
return .init(
Expand All @@ -32,90 +31,63 @@ public struct SampleOutputTestnet {
var nodeListAddress: String = "0xd084604e5FA387FbC2Da8bAab07fDD6aDED4614A"
var updated = true
var torusNodeEndpoints = try! getSSSEndpoints(network: .legacy(.TESTNET))
var torusNodePub: [TorusNodePubModel] = [
var torusNodePub: [TorusNodePubModel] = [
.init(_X: "f74389b0a4c8d10d2a687ae575f69b20f412d41ab7f1fe6b358aa14871327247", _Y: "54e3a73098ed9bced3ef8821736e9794f9264a1420c0c7ad15d2fa617ba35ef7"),
.init(_X: "bc38813a6873e526087918507c78fc3a61624670ee851ecfb4f3bef55d027b5a", _Y: "ac4b21229f662a0aefdfdac21cf17c3261a392c74a8790db218b34e3e4c1d56a"),
.init(_X: "b56541684ea5fa40c8337b7688d502f0e9e092098962ad344c34e94f06d293fb", _Y: "759a998cef79d389082f9a75061a29190eec0cac99b8c25ddcf6b58569dad55c"),
.init(_X: "7bcb058d4c6ffc6ba4bfdfd93d141af35a66338a62c7c27cdad2ae3f8289b767", _Y: "336ab1935e41ed4719e162587f0ab55518db4207a1eb36cc72303f1b86689d2b"),
.init(_X: "bf12a136ef94399ea098f926f04e26a4ec4ac70f69cce274e8893704c4951773", _Y: "bdd44828020f52ce510e026338216ada184a6867eb4e19fb4c2d495d4a7e15e4"),

]
var torusIndexes: [BigUInt] = [1, 2, 3, 4, 5]

var val: AllNodeDetailsModel {


let sss = try! getSSSEndpoints(network: .legacy(.TESTNET))
let rss = try! getRSSEndpoints(network: .legacy(.TESTNET))
let tss = try! getTSSEndpoints(network: .legacy(.TESTNET))
return .init(_currentEpoch: currentEpoch, _torusNodeEndpoints: torusNodeEndpoints, _torusNodeSSSEndpoints: sss, _torusNodeRSSEndpoints: rss, _torusNodeTSSEndpoints: tss, _torusIndexes: torusIndexes, _torusNodePub: torusNodePub, _updated: updated )

return .init(_currentEpoch: currentEpoch, _torusNodeEndpoints: torusNodeEndpoints, _torusNodeSSSEndpoints: sss, _torusNodeRSSEndpoints: rss, _torusNodeTSSEndpoints: tss, _torusIndexes: torusIndexes, _torusNodePub: torusNodePub, _updated: updated)
}
}

public struct SampleOutputCyan {
var currentEpoch: String = "1"
var nodeListAddress = "0x9f072ba19b3370e512aa1b4bfcdaf97283168005"
var updated = true
var torusNodeEndpoints = [
"https://node-1.torus-cluster-1.com/jrpc",
"https://node-2.torus-cluster-1.com/jrpc",
"https://node-3.torus-cluster-1.com/jrpc",
"https://node-4.torus-cluster-1.com/jrpc",
"https://node-5.torus-cluster-1.com/jrpc",
]
var torusNodePub: [TorusNodePubModel] = [
.init(_X: "805f81fd2fdc0d207b5a8b6643cd8f885bb761942f31fd6e138fcf8871d44cff", _Y:
"10bd6ec1675147256fbc4094c05191975a175d49ae8716ee83409929e6a302e7"),

.init(_X: "28394dafddfa20cb9ef5c9c26c31415c613565c3bbd9a82af8bfc88376e65353", _Y:
"5507f59c00d585fbed0ca08773a24faea4724e2b68be3da1e7281d5968251f1b"),

.init(_X: "4a190019eea47a45e6edb6a871a850b67fb72dcd9e255a07156c31dbf3a40035", _Y:
"565aa310a9e736f03d0693df4723880cafe25edba46c9ee88ace6453044d5ae9"),

.init(_X: "8a0f03b3ad07b1bd6068bb0aad3fe9feea5181643b04d292c65769c96b5990f8", _Y:
"4b34b66a7d91ff85f330a3c012a7bf45f5509be57bdf61885a906214d818a695"),

.init(_X: "dcf3b3c5a9e43533b875862b4dcfd5614535e7838d9a916f3f735e28e345cd9d", _Y:
"856d980747c1d171972b2ea34831670763d4b493ea7537b295b4be4c25b012fc"),
]
var torusIndexes: [BigUInt] = [1, 2, 3, 4, 5]
var val: AllNodeDetailsModel {
return .init(_currentEpoch: currentEpoch, _torusNodeEndpoints: torusNodeEndpoints, _torusIndexes: torusIndexes, _torusNodePub: torusNodePub, _updated: updated)
return .init(
_currentEpoch: "1",
_torusNodeEndpoints: try! getSSSEndpoints(network: .legacy(.CYAN)),
_torusNodeSSSEndpoints: try! getSSSEndpoints(network: .legacy(.CYAN)),
_torusNodeRSSEndpoints: try! getRSSEndpoints(network: .legacy(.CYAN)),
_torusNodeTSSEndpoints: try! getTSSEndpoints(network: .legacy(.CYAN)),
_torusIndexes: [1, 2, 3, 4, 5],
_torusNodePub: [
.init(_X: "e0925898fee0e9e941fdca7ee88deec99939ae9407e923535c4d4a3a3ff8b052", _Y: "54b9fea924e3f3e40791f9987f4234ae4222412d65b74068032fa5d8b63375c1"),
.init(_X: "9124cf1e280aab32ba50dffd2de81cecabc13d82d2c1fe9de82f3b3523f9b637", _Y: "fca939a1ceb42ce745c55b21ef094f543b457630cb63a94ef4f1afeee2b1f107"),
.init(_X: "555f681a63d469cc6c3a58a97e29ebd277425f0e6159708e7c7bf05f18f89476", _Y: "606f2bcc0884fa5b64366fc3e8362e4939841b56acd60d5f4553cf36b891ac4e"),
.init(_X: "2b5f58d8e340f1ab922e89b3a69a68930edfe51364644a456335e179bc130128", _Y: "4b4daa05939426e3cbe7d08f0e773d2bf36f64c00d04620ee6df2a7af4d2247"),
.init(_X: "3ecbb6a68afe72cf34ec6c0a12b5cb78a0d2e83ba402983b6adbc5f36219861a", _Y: "dc1031c5cc8f0472bd521a62a64ebca9e163902c247bf05937daf4ae835091e4"),
],
_updated: true
)
}
}

public struct SampleOutputAqua {
var currentEpoch: String = "1"
var nodeListAddress = "0x29Dea82a0509153b91040ee13cDBba0f03efb625"
var updated = true
var torusNodeEndpoints = [
"https://node-1.cluster-2.aqua.web3auth.io/jrpc",
"https://node-2.cluster-2.aqua.web3auth.io/jrpc",
"https://node-3.cluster-2.aqua.web3auth.io/jrpc",
"https://node-4.cluster-2.aqua.web3auth.io/jrpc",
"https://node-5.cluster-2.aqua.web3auth.io/jrpc",
]
var torusNodePub: [TorusNodePubModel] = [
.init(_X: "7d376a4a7ce6bba7a8a49001aaa2de3f24e0f56ee73a77c6678ec00363616f25", _Y:
"d5752873e522f98b4ded27690aadfda57ff5dc2fd0c3055b9d83663441667010"),

.init(_X: "0e1b5debe1d9b42eb9917a5fe84fa5f48cae7a770b1f49f0546fbe26b1efaff3", _Y:
"8947458cbfd8b40c7bc6160c7c746c2dca65c7d6ffdccd5579203b92a020b4ad"),

.init(_X: "98c3582b138b375b643984094882c17ca7ee090787c0a7065d229672845aa25e", _Y:
"02c3923bd015faac2cf3d91ab4cf8c6cdd4eb9f99e407a35703edf17e8c35d"),

.init(_X: "e7ef4c1ea43bd385ab8bfb02a5aedcd33bed35b95980c0729e9a35edd02a8597", _Y:
"d540aa7d1c9cafd2216e089b8c795a9034368960729103c9a2c875d76b81fc6d"),

.init(_X: "bb7d3500ead64d0bccd97f24b5c848ff6cbe867c0c03ca9f2922626ac5d1e49d", _Y:
"865ea03db0501bc9ffa83600202de437c7c10aa511c58ba54683b4d5f56ae314"),
]
var torusIndexes: [BigUInt] = [1, 2, 3, 4, 5]
var val: AllNodeDetailsModel {
return .init(_currentEpoch: currentEpoch, _torusNodeEndpoints: torusNodeEndpoints, _torusIndexes: torusIndexes, _torusNodePub: torusNodePub, _updated: updated)
return .init(
_currentEpoch: "1",
_torusNodeEndpoints: try! getSSSEndpoints(network: .legacy(.AQUA)),
_torusNodeSSSEndpoints: try! getSSSEndpoints(network: .legacy(.AQUA)),
_torusNodeRSSEndpoints: try! getRSSEndpoints(network: .legacy(.AQUA)),
_torusNodeTSSEndpoints: try! getTSSEndpoints(network: .legacy(.AQUA)),
_torusIndexes: [1, 2, 3, 4, 5],
_torusNodePub: [
.init(_X: "e0925898fee0e9e941fdca7ee88deec99939ae9407e923535c4d4a3a3ff8b052", _Y: "54b9fea924e3f3e40791f9987f4234ae4222412d65b74068032fa5d8b63375c1"),
.init(_X: "9124cf1e280aab32ba50dffd2de81cecabc13d82d2c1fe9de82f3b3523f9b637", _Y: "fca939a1ceb42ce745c55b21ef094f543b457630cb63a94ef4f1afeee2b1f107"),
.init(_X: "555f681a63d469cc6c3a58a97e29ebd277425f0e6159708e7c7bf05f18f89476", _Y: "606f2bcc0884fa5b64366fc3e8362e4939841b56acd60d5f4553cf36b891ac4e"),
.init(_X: "2b5f58d8e340f1ab922e89b3a69a68930edfe51364644a456335e179bc130128", _Y: "4b4daa05939426e3cbe7d08f0e773d2bf36f64c00d04620ee6df2a7af4d2247"),
.init(_X: "3ecbb6a68afe72cf34ec6c0a12b5cb78a0d2e83ba402983b6adbc5f36219861a", _Y: "dc1031c5cc8f0472bd521a62a64ebca9e163902c247bf05937daf4ae835091e4"),
],
_updated: true
)
}
}

Expand Down Expand Up @@ -152,7 +124,6 @@ public struct SampleOutputCeleste {
}
}


public struct SampleOutputSAPPHIREDEVNET {
var val: AllNodeDetailsModel {
return .init(
Expand Down
92 changes: 31 additions & 61 deletions Tests/FetchNodeDetailsTests/fetchNodeDetailsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ import XCTest
class fetchNodeDetailsTests: XCTestCase {
var timeout: TimeInterval = 10
var verifierId = "[email protected]"
func test_getNode_Mainnet() async {
func test_getNode_Mainnet() async throws {
let fnd = NodeDetailManager(network: .legacy(.MAINNET))
do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputMainnet().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputMainnet().val)
}

// TODO: https://mainnet.infura.io/v3/7f287687b3d049e2bea7b64869ee30a3 is unsupported network
Expand All @@ -27,71 +23,45 @@ class fetchNodeDetailsTests: XCTestCase {
// }
// }

func test_getNode_Testnet() async {
func test_getNode_Testnet() async throws {
let fnd = NodeDetailManager(network: .legacy(.TESTNET))

do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputTestnet().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputTestnet().val)
}
func test_getNode_SapphireDevnet() async {

func test_getNode_SapphireDevnet() async throws {
let fnd = NodeDetailManager(network: .sapphire(.SAPPHIRE_DEVNET))
do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
var config = try! SapphireConfig(network: .SAPPHIRE_DEVNET)
config.updated = true
XCTAssertEqual(result, config)
XCTAssertEqual(result, SampleOutputSAPPHIREDEVNET().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
var config = try! SapphireConfig(network: .SAPPHIRE_DEVNET)
config.updated = true
XCTAssertEqual(result, config)
XCTAssertEqual(result, SampleOutputSAPPHIREDEVNET().val)
}
func test_getNode_SapphireMainnet() async {

func test_getNode_SapphireMainnet() async throws {
let fnd = NodeDetailManager(network: .sapphire(.SAPPHIRE_MAINNET))
do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
var config = try! SapphireConfig(network: .SAPPHIRE_MAINNET)
config.updated = true
XCTAssertEqual(result, config)
XCTAssertEqual(result, SampleOutputSAPPHIREMAINNET().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
var config = try! SapphireConfig(network: .SAPPHIRE_MAINNET)
config.updated = true
XCTAssertEqual(result, config)
XCTAssertEqual(result, SampleOutputSAPPHIREMAINNET().val)
}


func test_getNode_Cyan() async {

func test_getNode_Cyan() async throws {
let fnd = NodeDetailManager(network: .legacy(.CYAN))
do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputCyan().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputCyan().val)
}

func test_getNode_Aqua() async {
func test_getNode_Aqua() async throws {
let fnd = NodeDetailManager(network: .legacy(.AQUA))
do {
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputAqua().val)
} catch {
XCTFail(error.localizedDescription)
}
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: verifierId)
XCTAssertEqual(result, SampleOutputAqua().val)
}

func test_getNode_Celeste() async {
do {
let fnd = NodeDetailManager(network: .legacy(.CELESTE))
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: "[email protected]")
XCTAssertEqual(result, SampleOutputCeleste().val)
} catch {
XCTFail()
}
func test_getNode_Celeste() async throws {
let fnd = NodeDetailManager(network: .legacy(.CELESTE))
let result = try await fnd.getNodeDetails(verifier: "google", verifierID: "[email protected]")
XCTAssertEqual(result, SampleOutputCeleste().val)
}
}

0 comments on commit 4a887d3

Please sign in to comment.