Skip to content

Commit 1b991c6

Browse files
JeneaVranceanuJeneaVranceanu
committed
fix: fixed tests
1 parent ac05664 commit 1b991c6

File tree

2 files changed

+75
-15
lines changed

2 files changed

+75
-15
lines changed

‎Tests/web3swiftTests/remoteTests/ENSTests.swift‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ class ENSTests: XCTestCase {
2323
}
2424

2525
func testResolverAddress() async throws {
26-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
26+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
27+
else {
28+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
29+
return
30+
}
2731
let ens = ENS(web3: web3)
2832
let domain = "somename.eth"
2933
let address = try await ens?.registry.getResolver(forDomain: domain).resolverContractAddress
@@ -32,15 +36,23 @@ class ENSTests: XCTestCase {
3236
}
3337

3438
func testResolver() async throws {
35-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
39+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
40+
else {
41+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
42+
return
43+
}
3644
let ens = ENS(web3: web3)
3745
let domain = "somename.eth"
3846
let address = try await ens?.getAddress(forNode: domain)
3947
XCTAssertEqual(address?.address.lowercased(), "0xc1ccfb5fc589b83b9e849c6f9b26efc71419898d")
4048
}
4149

4250
func testSupportsInterface() async throws {
43-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
51+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
52+
else {
53+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
54+
return
55+
}
4456
let ens = ENS(web3: web3)
4557
let domain = "somename.eth"
4658
let resolver = try await ens?.registry.getResolver(forDomain: domain)
@@ -55,7 +67,11 @@ class ENSTests: XCTestCase {
5567
}
5668

5769
func testABI() async throws {
58-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
70+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
71+
else {
72+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
73+
return
74+
}
5975
let ens = ENS(web3: web3)
6076
let domain = "somename.eth"
6177
let resolver = try await ens?.registry.getResolver(forDomain: domain)
@@ -70,23 +86,35 @@ class ENSTests: XCTestCase {
7086
}
7187

7288
func testOwner() async throws {
73-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
89+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
90+
else {
91+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
92+
return
93+
}
7494
let ens = ENS(web3: web3)
7595
let domain = "somename.eth"
7696
let owner = try await ens?.registry.getOwner(node: domain)
7797
XCTAssertEqual("0xc1ccfb5fc589b83b9e849c6f9b26efc71419898d", owner?.address.lowercased())
7898
}
7999

80100
func testTTL() async throws {
81-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
101+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
102+
else {
103+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
104+
return
105+
}
82106
let ens = try XCTUnwrap(ENS(web3: web3))
83107
let domain = "somename.eth"
84108
let ttl = try await ens.registry.getTTL(node: domain)
85109
XCTAssertGreaterThanOrEqual(ttl, 0)
86110
}
87111

88112
func testGetAddress() async throws {
89-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
113+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
114+
else {
115+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
116+
return
117+
}
90118
let ens = ENS(web3: web3)
91119
let domain = "somename.eth"
92120
let resolver = try await ens?.registry.getResolver(forDomain: domain)
@@ -95,7 +123,11 @@ class ENSTests: XCTestCase {
95123
}
96124

97125
func testGetPubkey() async throws {
98-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
126+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
127+
else {
128+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
129+
return
130+
}
99131
let ens = ENS(web3: web3)
100132
let domain = "somename.eth"
101133
let resolver = try await ens?.registry.getResolver(forDomain: domain)

‎Tests/web3swiftTests/remoteTests/InfuraTests.swift‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,62 @@ import Web3Core
1212
class InfuraTests: XCTestCase {
1313

1414
func testGetBalance() async throws {
15-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
15+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
16+
else {
17+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
18+
return
19+
}
1620
let address = EthereumAddress("0xd61b5ca425F8C8775882d4defefC68A6979DBbce")!
1721
let balance = try await web3.eth.getBalance(for: address)
1822
let balString = Utilities.formatToPrecision(balance, units: .ether, formattingDecimals: 3)
1923
XCTAssertNotNil(balString)
2024
}
2125

2226
func testGetBlockByHash() async throws {
23-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
27+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
28+
else {
29+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
30+
return
31+
}
2432
let result = try await web3.eth.block(by: "0x6d05ba24da6b7a1af22dc6cc2a1fe42f58b2a5ea4c406b19c8cf672ed8ec0695", fullTransactions: false)
2533
XCTAssertEqual(result.number, 5184323)
2634
}
2735

2836
func testGetBlockByHash_hashAsData() async throws {
2937
let blockHash = Data.fromHex("6d05ba24da6b7a1af22dc6cc2a1fe42f58b2a5ea4c406b19c8cf672ed8ec0695")!
30-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
38+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
39+
else {
40+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
41+
return
42+
}
3143
let result = try await web3.eth.block(by: blockHash, fullTransactions: false)
3244
XCTAssertEqual(result.number, 5184323)
3345
}
3446

3547
func testGetBlockByNumber1() async throws {
36-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
48+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
49+
else {
50+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
51+
return
52+
}
3753
_ = try await web3.eth.block(by: .latest, fullTransactions: false)
3854
}
3955

4056
func testGetBlockByNumber2() async throws {
41-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
57+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
58+
else {
59+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
60+
return
61+
}
4262
_ = try await web3.eth.block(by: .exact(5184323), fullTransactions: true)
4363
}
4464

4565
func testGetBlockByNumber3() async {
46-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
66+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
67+
else {
68+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
69+
return
70+
}
4771
do {
4872
_ = try await web3.eth.block(by: .exact(10000000000000), fullTransactions: true)
4973
XCTFail("The expression above must throw DecodingError.")
@@ -54,7 +78,11 @@ class InfuraTests: XCTestCase {
5478
}
5579

5680
func testGasPrice() async throws {
57-
let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
81+
guard let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
82+
else {
83+
XCTFail("Failed to connect to InfuraMainnet using token \(Constants.infuraToken)")
84+
return
85+
}
5886
_ = try await web3.eth.gasPrice()
5987
}
6088

0 commit comments

Comments
 (0)