Skip to content

Commit 5a096ef

Browse files
yaroslavyaroslavyaroslavyaroslav
committed
Crop all print from Tests.
Closes #639
1 parent d8dd9a2 commit 5a096ef

21 files changed

+106
-116
lines changed

‎Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AdvancedABIv2Tests: LocalTestCase {
3131
Thread.sleep(forTimeInterval: 1.0)
3232

3333
let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
34-
print(receipt)
34+
3535

3636
switch receipt.status {
3737
case .notYetProcessed:
@@ -45,7 +45,7 @@ class AdvancedABIv2Tests: LocalTestCase {
4545
// MARK: - Encoding ABI Data flow
4646
let tx = contract.createReadOperation("testSingle")
4747
let testSingle = try await tx!.callContractMethod()
48-
print(testSingle.description)
48+
4949
}
5050

5151
func testAdvancedABIv2staticArray() async throws {
@@ -67,7 +67,7 @@ class AdvancedABIv2Tests: LocalTestCase {
6767
Thread.sleep(forTimeInterval: 1.0)
6868

6969
let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
70-
print(receipt)
70+
7171

7272
switch receipt.status {
7373
case .notYetProcessed:
@@ -81,7 +81,7 @@ class AdvancedABIv2Tests: LocalTestCase {
8181
// MARK: - Encoding ABI Data flow
8282
let tx = contract.createReadOperation("testStaticArray")
8383
let testStaticArray = try await tx!.callContractMethod()
84-
print(testStaticArray.description)
84+
8585
}
8686

8787
func testAdvancedABIv2dynamicArray() async throws {
@@ -103,7 +103,7 @@ class AdvancedABIv2Tests: LocalTestCase {
103103
Thread.sleep(forTimeInterval: 1.0)
104104

105105
let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
106-
print(receipt)
106+
107107

108108
switch receipt.status {
109109
case .notYetProcessed:
@@ -116,7 +116,7 @@ class AdvancedABIv2Tests: LocalTestCase {
116116

117117
let tx = contract.createReadOperation("testDynArray")
118118
let testDynArray = try await tx!.callContractMethod()
119-
print(testDynArray.description)
119+
120120
}
121121

122122
func testAdvancedABIv2dynamicArrayOfStrings() async throws {
@@ -138,7 +138,7 @@ class AdvancedABIv2Tests: LocalTestCase {
138138
Thread.sleep(forTimeInterval: 1.0)
139139

140140
let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
141-
print(receipt)
141+
142142

143143
switch receipt.status {
144144
case .notYetProcessed:
@@ -152,7 +152,7 @@ class AdvancedABIv2Tests: LocalTestCase {
152152
// MARK: - Encoding ABI Data flow
153153
let tx = contract.createReadOperation("testDynOfDyn")
154154
let testDynOfDyn = try await tx!.callContractMethod()
155-
print(testDynOfDyn.description)
155+
156156
}
157157

158158
func testAdvancedABIv2staticArrayOfStrings() async throws {
@@ -174,7 +174,7 @@ class AdvancedABIv2Tests: LocalTestCase {
174174
Thread.sleep(forTimeInterval: 1.0)
175175

176176
let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
177-
print(receipt)
177+
178178

179179
switch receipt.status {
180180
case .notYetProcessed:
@@ -188,7 +188,7 @@ class AdvancedABIv2Tests: LocalTestCase {
188188
// MARK: - Encoding ABI Data flow
189189
let tx = contract.createReadOperation("testStOfDyn")
190190
let testStOfDyn = try await tx!.callContractMethod()
191-
print(testStOfDyn.description)
191+
192192
}
193193

194194
func testEmptyArrayDecoding() async throws {

‎Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ class BasicLocalNodeTests: LocalTestCase {
5757

5858
let balanceBeforeTo = try await web3.eth.getBalance(for: sendToAddress)
5959
let balanceBeforeFrom = try await web3.eth.getBalance(for: allAddresses[0])
60-
print("Balance before to: " + balanceBeforeTo.description)
61-
print("Balance before from: " + balanceBeforeFrom.description)
60+
61+
6262

6363
let result = try await sendTx.writeToChain(password: "web3swift")
6464
let txHash = Data.fromHex(result.hash.stripHexPrefix())!
6565

6666
Thread.sleep(forTimeInterval: 1.0)
6767

6868
let receipt = try await web3.eth.transactionReceipt(txHash)
69-
print(receipt)
69+
7070

7171
switch receipt.status {
7272
case .notYetProcessed:
@@ -76,12 +76,12 @@ class BasicLocalNodeTests: LocalTestCase {
7676
}
7777

7878
let details = try await web3.eth.transactionDetails(txHash)
79-
print(details)
79+
8080

8181
let balanceAfterTo = try await web3.eth.getBalance(for: sendToAddress)
8282
let balanceAfterFrom = try await web3.eth.getBalance(for: allAddresses[0])
83-
print("Balance after to: " + balanceAfterTo.description)
84-
print("Balance after from: " + balanceAfterFrom.description)
83+
84+
8585

8686
XCTAssertEqual(balanceAfterTo - balanceBeforeTo, valueToSend)
8787
let txnGasPrice = details.transaction.meta?.gasPrice ?? 0

‎Tests/web3swiftTests/localTests/DataConversionTests.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ class DataConversionTests: LocalTestCase {
2222
func testBase58() throws {
2323
let vector = ""
2424

25-
print("Testing Base58 Decode \"\(vector)\"")
25+
2626
guard let resultDecoded = vector.base58DecodedData else { return XCTFail("base58 decode unexpectedly returned nil") }
2727
XCTAssert(resultDecoded.count == 0)
2828

29-
print("Testing Base58 Encode \"\(vector)\"")
29+
3030
let resultEncoded1 = vector.base58EncodedString
3131
XCTAssert(resultEncoded1 == vector)
3232

33-
print("Testing Base58 Encode [empty]")
33+
3434
let arr = resultDecoded.withUnsafeBytes { Array($0) }
3535
let resultEncoded2 = arr.base58EncodedString
3636
XCTAssert(resultEncoded2 == vector)
@@ -41,13 +41,13 @@ class DataConversionTests: LocalTestCase {
4141
let vector = "2NEpo7TZRRrLZSi2U"
4242
let expected = "Hello World!"
4343

44-
print("Testing Base58 Decode \"\(vector)\"")
44+
4545
guard let resultDecoded = vector.base58DecodedData else { return XCTFail("base58 decode unexpectedly returned nil") }
4646
let arr = resultDecoded.withUnsafeBytes { Array($0) }
4747
let str = String(bytes: arr, encoding: .utf8)
4848
XCTAssert(str == expected)
4949

50-
print("Testing Base58 Encode \"\(expected)\"")
50+
5151
let resultEncoded = expected.base58EncodedString
5252
XCTAssert(resultEncoded == vector)
5353
}
@@ -57,13 +57,13 @@ class DataConversionTests: LocalTestCase {
5757
let vector = "USm3fpXnKG5EUBx2ndxBDMPVciP5hGey2Jh4NDv6gmeo1LkMeiKrLJUUBk6Z"
5858
let expected = "The quick brown fox jumps over the lazy dog."
5959

60-
print("Testing Base58 Decode \"\( vector )\"")
60+
6161
guard let resultDecoded = vector.base58DecodedData else { return XCTFail("base58 decode unexpectedly returned nil") }
6262
let arr = resultDecoded.withUnsafeBytes { Array($0) }
6363
let str = String(bytes: arr, encoding: .utf8)
6464
XCTAssert(str == expected)
6565

66-
print("Testing Base58 Encode \"\(expected)\"")
66+
6767
let resultEncoded = expected.base58EncodedString
6868
XCTAssert(resultEncoded == vector)
6969
}
@@ -73,12 +73,12 @@ class DataConversionTests: LocalTestCase {
7373
let vector = "111233QC4"
7474
let expected = "0x000000287fb4cd"
7575

76-
print("Testing Base58 Decode \"\(vector)\"")
76+
7777
guard let resultDecoded = vector.base58DecodedData else { return XCTFail("base58 decode unexpectedly returned nil") }
7878
let str = resultDecoded.toHexString().addHexPrefix()
7979
XCTAssert(str == expected)
8080

81-
print("Testing Base58 Encode \(expected)")
81+
8282
let arr = resultDecoded.withUnsafeBytes { Array($0) }
8383
let resultEncoded = arr.base58EncodedString
8484
XCTAssert(resultEncoded == vector)
@@ -89,12 +89,12 @@ class DataConversionTests: LocalTestCase {
8989
let vector = "11111111111111111111111111111111"
9090
let expected = "0x0000000000000000000000000000000000000000000000000000000000000000"
9191

92-
print("Testing Base58 Decode \"\(vector)\"")
92+
9393
guard let resultDecoded = vector.base58DecodedData else { return XCTFail("base58 decode unexpectedly returned nil") }
9494
let str = resultDecoded.toHexString().addHexPrefix()
9595
XCTAssert(str == expected)
9696

97-
print("Testing Base58 Encode \(expected)")
97+
9898
let arr = resultDecoded.withUnsafeBytes { Array($0) }
9999
let resultEncoded = arr.base58EncodedString
100100
XCTAssert(resultEncoded == vector)

‎Tests/web3swiftTests/localTests/EIP67Tests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class EIP67Tests: LocalTestCase {
1818
eip67Data.amount = BigUInt("1000000000000000000")
1919
// eip67Data.data =
2020
let encoding = eip67Data.toString()
21-
print(encoding)
21+
2222
}
2323

2424
func testEIP67codeGeneration() throws {

‎Tests/web3swiftTests/localTests/ERC20Tests.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class ERC20Tests: LocalTestCase {
3030
readTX.transaction.from = addressOfUser
3131
let tokenBalance = try await readTX.callContractMethod()
3232
guard let bal = tokenBalance["0"] as? BigUInt else {return XCTFail()}
33-
print(String(bal))
3433
}
3534

3635
// FIXME: Make me work

‎Tests/web3swiftTests/localTests/EventloopTests.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ class EventloopTests: XCTestCase {
1616
func getBlockNumber(_ web3: Web3) async {
1717
do {
1818
let blockNumber = try await web3.eth.blockNumber()
19-
print("Block number = " + String(blockNumber))
2019
ticksToWait = ticksToWait - 1
2120
if ticksToWait == 0 {
2221
expectation.fulfill()
2322
}
2423
} catch {
25-
print(error)
24+
2625
}
2726
}
2827

‎Tests/web3swiftTests/localTests/KeystoresTests.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ class KeystoresTests: LocalTestCase {
8181
let keystore = try! EthereumKeystoreV3(password: "")
8282
XCTAssertNotNil(keystore)
8383
let account = keystore!.addresses![0]
84-
print(account)
84+
8585
let data = try! keystore!.serialize()
86-
print(try! JSONSerialization.jsonObject(with: data!, options: JSONSerialization.ReadingOptions(rawValue: 0)))
8786
let key = try! keystore!.UNSAFE_getPrivateKeyData(password: "", account: account)
8887
XCTAssertNotNil(key)
8988
}
@@ -173,7 +172,7 @@ class KeystoresTests: LocalTestCase {
173172
let account = keystore!.addresses![1]
174173
let key = try! keystore!.UNSAFE_getPrivateKeyData(password: "", account: account)
175174
XCTAssertNotNil(key)
176-
print(keystore!.addressStorage.paths)
175+
177176
}
178177

179178
func testByBIP32keystoreSaveAndDeriva() throws {
@@ -187,10 +186,10 @@ class KeystoresTests: LocalTestCase {
187186
let recreatedStore = BIP32Keystore.init(data!)
188187
XCTAssert(keystore?.addresses?.count == recreatedStore?.addresses?.count)
189188
XCTAssert(keystore?.rootPrefix == recreatedStore?.rootPrefix)
190-
print(keystore!.addresses![0].address)
191-
print(keystore!.addresses![1].address)
192-
print(recreatedStore!.addresses![0].address)
193-
print(recreatedStore!.addresses![1].address)
189+
190+
191+
192+
194193
XCTAssert(keystore?.addresses![0] == recreatedStore?.addresses![0])
195194
XCTAssert(keystore?.addresses![1] == recreatedStore?.addresses![1])
196195
}

‎Tests/web3swiftTests/localTests/LocalTestCase.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Foundation
22
import XCTest
33
import BigInt
44
import Core
5+
import os.log
56

67
import web3swift
78

@@ -18,7 +19,7 @@ class LocalTestCase: XCTestCase {
1819
let block = try! await web3.eth.blockNumber()
1920
if block >= 25 { return }
2021

21-
print("\n ****** Preloading Ganache (\(25 - block) blocks) *****\n")
22+
os_log("\n ****** Preloading Ganache (\(25 - block) blocks) *****\n")
2223

2324
let allAddresses = try! await web3.eth.ownedAccounts()
2425
let sendToAddress = allAddresses[0]

‎Tests/web3swiftTests/localTests/NumberFormattingUtilTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class NumberFormattingUtilTests: LocalTestCase {
1414

1515
func testNumberFormattingUtil() throws {
1616
let balance = BigInt("-1000000000000000000")
17-
print("this is print")
17+
1818
let formatted = Utilities.formatToPrecision(balance, numberDecimals: 18, formattingDecimals: 4, decimalSeparator: ",")
1919
XCTAssert(formatted == "-1")
2020
}

‎Tests/web3swiftTests/localTests/PersonalSignatureTests.swift‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@ class PersonalSignatureTests: XCTestCase {
1919
web3.addKeystoreManager(keystoreManager)
2020
let message = "Hello World"
2121
let expectedAddress = keystoreManager.addresses![0]
22-
print(expectedAddress)
22+
2323
let signature = try await web3.personal.signPersonalMessage(message: message.data(using: .utf8)!, from: expectedAddress, password: "")
2424
let unmarshalledSignature = SECP256K1.unmarshalSignature(signatureData: signature)!
25-
print("V = " + String(unmarshalledSignature.v))
26-
print("R = " + Data(unmarshalledSignature.r).toHexString())
27-
print("S = " + Data(unmarshalledSignature.s).toHexString())
28-
print("Personal hash = " + Utilities.hashPersonalMessage(message.data(using: .utf8)!)!.toHexString())
2925
let signer = try web3.personal.ecrecover(personalMessage: message.data(using: .utf8)!, signature: signature)
3026
XCTAssert(expectedAddress == signer, "Failed to sign personal message")
3127
}
@@ -48,7 +44,7 @@ class PersonalSignatureTests: XCTestCase {
4844
Thread.sleep(forTimeInterval: 1.0)
4945

5046
let receipt = try await web3.eth.transactionReceipt(txHash)
51-
print(receipt)
47+
5248

5349
switch receipt.status {
5450
case .notYetProcessed:
@@ -63,13 +59,9 @@ class PersonalSignatureTests: XCTestCase {
6359
web3.addKeystoreManager(keystoreManager)
6460
let message = "Hello World"
6561
let expectedAddress = keystoreManager.addresses![0]
66-
print(expectedAddress)
62+
6763
let signature = try await web3.personal.signPersonalMessage(message: message.data(using: .utf8)!, from: expectedAddress, password: "")
6864
let unmarshalledSignature = SECP256K1.unmarshalSignature(signatureData: signature)!
69-
print("V = " + String(unmarshalledSignature.v))
70-
print("R = " + Data(unmarshalledSignature.r).toHexString())
71-
print("S = " + Data(unmarshalledSignature.s).toHexString())
72-
print("Personal hash = " + Utilities.hashPersonalMessage(message.data(using: .utf8)!)!.toHexString())
7365

7466
// Calling contract
7567
contract = web3.contract(abiString, at: receipt.contractAddress!)!

0 commit comments

Comments
 (0)