Skip to content

Commit 2cdb1cb

Browse files
project fix
1 parent 17ce146 commit 2cdb1cb

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

web3swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
3AC3BD7E222EA70500656EC7 /* Web3+ST20.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC3BD7C222EA70500656EC7 /* Web3+ST20.swift */; };
3131
3AC3BD80222EC6C900656EC7 /* Web3+SecurityToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC3BD7F222EC6C900656EC7 /* Web3+SecurityToken.swift */; };
3232
3AC3BD81222EC6C900656EC7 /* Web3+SecurityToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC3BD7F222EC6C900656EC7 /* Web3+SecurityToken.swift */; };
33-
3AE494F7224A23C300AB2972 /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
34-
3AE494F8224A23CD00AB2972 /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
3533
4194811B203630530065A83B /* Web3+HttpProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 817EBB142004FE4200E02EAA /* Web3+HttpProvider.swift */; };
3634
4194811E203630530065A83B /* Web3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81DDECCE1FDF004E0063684A /* Web3.swift */; };
3735
4194811F203630530065A83B /* Web3+Instance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818ABD5A1FE95F8F002657BB /* Web3+Instance.swift */; };
@@ -1190,7 +1188,6 @@
11901188
isa = PBXSourcesBuildPhase;
11911189
buildActionMask = 2147483647;
11921190
files = (
1193-
3AE494F7224A23C300AB2972 /* NonceMiddleware.swift in Sources */,
11941191
3AC1E7CB222D6A8C004F43D8 /* Web3+BrowserFunctions.swift in Sources */,
11951192
E2DCA654218C879900F94FBA /* ENS.swift in Sources */,
11961193
E2DCA655218C879900F94FBA /* ENSResolver.swift in Sources */,
@@ -1314,7 +1311,6 @@
13141311
isa = PBXSourcesBuildPhase;
13151312
buildActionMask = 2147483647;
13161313
files = (
1317-
3AE494F8224A23CD00AB2972 /* NonceMiddleware.swift in Sources */,
13181314
3AC1E7D9222D6AA0004F43D8 /* Web3+BrowserFunctions.swift in Sources */,
13191315
3AC1E7CC222D6A99004F43D8 /* Web3+ERC1376.swift in Sources */,
13201316
3AC1E7CD222D6A99004F43D8 /* Web3+ERC1155.swift in Sources */,

web3swiftTests/web3swift_Eventloop_Tests.swift

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,33 @@ class web3swift_Eventloop_Tests: XCTestCase {
3535
waitForExpectations(timeout: 60, handler: nil)
3636
}
3737

38-
func testNonceMiddleware() {
39-
let web3 = Web3.InfuraRinkebyWeb3()
40-
let middleware = Web3.Utils.NonceMiddleware()
41-
middleware.attach(web3)
42-
43-
let sendToAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
44-
let ksData = getKeystoreData()
45-
let tempKeystore = EthereumKeystoreV3(ksData!)
46-
let keystoreManager = KeystoreManager([tempKeystore!])
47-
web3.addKeystoreManager(keystoreManager)
48-
49-
var tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
50-
tx!.transactionOptions.from = tempKeystore!.addresses!.first!
51-
var result = try! tx!.send(password: "web3swift")
52-
let newNonce = result.transaction.nonce
53-
sleep(1)
54-
let hookNewNonce = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
55-
XCTAssertEqual(newNonce, hookNewNonce)
56-
57-
tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
58-
tx!.transactionOptions.from = tempKeystore!.addresses!.first!
59-
result = try! tx!.send(password: "web3swift")
60-
sleep(1)
61-
let newNonce2 = result.transaction.nonce
62-
let hookNewNonce2 = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
63-
XCTAssert(newNonce2 == hookNewNonce2)
64-
}
38+
// func testNonceMiddleware() {
39+
// let web3 = Web3.InfuraRinkebyWeb3()
40+
// let middleware = Web3.Utils.NonceMiddleware()
41+
// middleware.attach(web3)
42+
//
43+
// let sendToAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
44+
// let ksData = getKeystoreData()
45+
// let tempKeystore = EthereumKeystoreV3(ksData!)
46+
// let keystoreManager = KeystoreManager([tempKeystore!])
47+
// web3.addKeystoreManager(keystoreManager)
48+
//
49+
// var tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
50+
// tx!.transactionOptions.from = tempKeystore!.addresses!.first!
51+
// var result = try! tx!.send(password: "web3swift")
52+
// let newNonce = result.transaction.nonce
53+
// sleep(1)
54+
// let hookNewNonce = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
55+
// XCTAssertEqual(newNonce, hookNewNonce)
56+
//
57+
// tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
58+
// tx!.transactionOptions.from = tempKeystore!.addresses!.first!
59+
// result = try! tx!.send(password: "web3swift")
60+
// sleep(1)
61+
// let newNonce2 = result.transaction.nonce
62+
// let hookNewNonce2 = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
63+
// XCTAssert(newNonce2 == hookNewNonce2)
64+
// }
6565

6666

6767
func getKeystoreData() -> Data? {

0 commit comments

Comments
 (0)