Skip to content

Commit 27f504e

Browse files
committed
propagate async
1 parent 6f2d7f2 commit 27f504e

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

Tests/web3swiftTests/localTests/web3swiftERC20ClassTests.swift

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,27 @@ import BigInt
1111

1212
class web3swiftERC20ClassTests: XCTestCase {
1313

14-
func testERC20TokenCreation() throws {
15-
let (web3, _, receipt, _) = try web3swiftHelpers.localDeployERC20()
14+
func testERC20TokenCreation() async throws {
15+
let (web3, _, receipt, _) = try await web3swiftHelpers.localDeployERC20()
1616
let erc20token = ERC20.init(web3: web3, provider: web3.provider, address: receipt.contractAddress!)
17-
erc20token.readProperties()
18-
XCTAssert(erc20token.symbol == "w3s")
19-
XCTAssert(erc20token.name == "web3swift")
20-
XCTAssert(erc20token.decimals == 18)
17+
try await erc20token.readProperties()
18+
19+
let symbol = try await erc20token.symbol()
20+
let name = try await erc20token.name()
21+
let decimals = try await erc20token.decimals()
22+
XCTAssert(symbol == "w3s")
23+
XCTAssert(name == "web3swift")
24+
XCTAssert(decimals == 18)
2125
}
2226

23-
func testERC20tokenBalanceAndAllowance() throws {
24-
let (web3, _, receipt, _) = try web3swiftHelpers.localDeployERC20()
27+
func testERC20tokenBalanceAndAllowance() async throws {
28+
let (web3, _, receipt, _) = try await web3swiftHelpers.localDeployERC20()
2529
let erc20token = ERC20.init(web3: web3, provider: web3.provider, address: receipt.contractAddress!)
2630

2731
let userAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
2832

29-
let balance = try erc20token.getBalance(account: userAddress)
30-
let allowance = try erc20token.getAllowance(originalOwner: userAddress, delegate: userAddress)
33+
let balance = try await erc20token.getBalance(account: userAddress)
34+
let allowance = try await erc20token.getAllowance(originalOwner: userAddress, delegate: userAddress)
3135
XCTAssert(String(balance) == "1024")
3236
XCTAssert(allowance == 0)
3337
}

Tests/web3swiftTests/remoteTests/web3swiftST20AndSecurityTokenTests.swift

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,44 @@ import BigInt
1313
// MARK: Works only with network connection
1414
class web3swiftST20AndSecurityTokenTests: XCTestCase {
1515

16-
func testERC20TokenCreation() throws {
17-
let web3 = Web3.GanacheWeb3(network: .Kovan)
16+
func testERC20TokenCreation() async throws {
17+
let web3 = await Web3.GanacheWeb3(network: .Kovan)
1818
let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
1919
let st20token = ST20.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
20-
st20token.readProperties()
21-
XCTAssert(st20token.symbol == "MIMI")
22-
XCTAssert(st20token.name == "Mimi")
23-
XCTAssert(st20token.decimals == 18)
20+
try await st20token.readProperties()
21+
let symbol = try await st20token.symbol()
22+
let name = try await st20token.name()
23+
let decimals = try await st20token.decimals()
24+
XCTAssert(symbol == "MIMI")
25+
XCTAssert(name == "Mimi")
26+
XCTAssert(decimals == 18)
2427
}
2528

26-
func testST20tokenBalanceAndAllowance() throws {
27-
let web3 = Web3.GanacheWeb3(network: .Kovan)
29+
func testST20tokenBalanceAndAllowance() async throws {
30+
let web3 = await Web3.GanacheWeb3(network: .Kovan)
2831
let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
2932
let st20token = ST20.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
3033
let userAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
31-
let balance = try st20token.getBalance(account: userAddress)
32-
let allowance = try st20token.getAllowance(originalOwner: userAddress, delegate: userAddress)
34+
let balance = try await st20token.getBalance(account: userAddress)
35+
let allowance = try await st20token.getAllowance(originalOwner: userAddress, delegate: userAddress)
3336
XCTAssert(String(balance) == "0")
3437
XCTAssert(allowance == 0)
3538
}
3639

37-
func testSecurityTokenInvestors() throws {
38-
let web3 = Web3.GanacheWeb3(network: .Kovan)
40+
func testSecurityTokenInvestors() async throws {
41+
let web3 = await Web3.GanacheWeb3(network: .Kovan)
3942
let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
4043
let stoken = SecurityToken.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
41-
let investorsCount = try stoken.investorCount()
44+
let investorsCount = try await stoken.investorCount()
4245
let stringInvestorsCount = String(investorsCount)
4346
XCTAssert(stringInvestorsCount == "0")
4447
}
4548

46-
func testSecurityTokenGranularity() throws {
47-
let web3 = Web3.GanacheWeb3(network: .Kovan)
49+
func testSecurityTokenGranularity() async throws {
50+
let web3 = await Web3.GanacheWeb3(network: .Kovan)
4851
let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
4952
let stoken = SecurityToken.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
50-
let granularity = try stoken.getGranularity()
53+
let granularity = try await stoken.getGranularity()
5154
let stringGranularity = String(granularity)
5255
XCTAssert(stringGranularity == "1000000000000000000")
5356
}

0 commit comments

Comments
 (0)