minor changes in tests

Author: FesenkoG

web3swiftTests/web3swift_Tests.swift

@@ -94,168 +94,6 @@ class web3swiftTests: XCTestCase {
         let privKey = SECP256K1.generatePrivateKey()
         XCTAssert(privKey != nil, "Failed to create new private key")
     }
-
-    
-//    func testConcurrenctGetTransactionCount()
-//    {
-//        let semaphore = DispatchSemaphore(value: 0)
-//        var fail = true;
-//        let web3 = Web3.InfuraMainnetWeb3()
-//        let address = EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")!
-//        let callback = { (res: Result<AnyObject, Web3Error>) -> () in
-//            switch res {
-//            case .success(let result):
-//                print(result)
-//                fail = false
-//            case .failure(let error):
-//                print(error)
-//                XCTFail()
-//                fatalError()
-//            }
-//            semaphore.signal()
-//        }
-//        web3.eth.getTransactionCount(address: address, onBlock: "latest", callback: callback, queue: web3.queue) // queue should be .main here, but can not test in this case with a simple semaphore (getting a deadlock)
-//        let _ = semaphore.wait(timeout: .distantFuture)
-//        XCTAssert(!fail)
-//    }
-//
-//    func testGetAllTokenBalances()
-//    {
-//        //        let semaphore = DispatchSemaphore(value: 0)
-//        let url = URL.init(string: "https://raw.githubusercontent.com/kvhnuke/etherwallet/mercury/app/scripts/tokens/ethTokens.json")
-//        let tokensData = try! Data.init(contentsOf: url!)
-//        let tokensJSON = try! JSONSerialization.jsonObject(with: tokensData, options: []) as! [[String: Any]]
-//        let jsonString = "[{\"constant\":true,\"inputs\":[],\"name\":\"name\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_spender\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"approve\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"totalSupply\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_from\",\"type\":\"address\"},{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"transferFrom\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"decimals\",\"outputs\":[{\"name\":\"\",\"type\":\"uint8\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"version\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"name\":\"balance\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"symbol\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"transfer\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_spender\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"},{\"name\":\"_extraData\",\"type\":\"bytes\"}],\"name\":\"approveAndCall\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\"},{\"name\":\"_spender\",\"type\":\"address\"}],\"name\":\"allowance\",\"outputs\":[{\"name\":\"remaining\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"_initialAmount\",\"type\":\"uint256\"},{\"name\":\"_tokenName\",\"type\":\"string\"},{\"name\":\"_decimalUnits\",\"type\":\"uint8\"},{\"name\":\"_tokenSymbol\",\"type\":\"string\"}],\"type\":\"constructor\"},{\"payable\":false,\"type\":\"fallback\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Transfer\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"_owner\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"_spender\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Approval\",\"type\":\"event\"},]"
-//        let web3 = Web3.InfuraMainnetWeb3()
-//        let userAddress = EthereumAddress("0xc011bf81e3f88931cf331856e45fab6b6450e54c")!
-//        var expected = tokensJSON.count
-//        print(String(expected) + " tokens to update")
-//        let semaphore = DispatchSemaphore(value: 0)
-//        for token in tokensJSON {
-//            let tokenSymbol = token["symbol"] as! String
-//            let tokenAddress = EthereumAddress(token["address"] as! String)
-//            let contract = web3.contract(jsonString, at: tokenAddress, abiVersion: 2)
-//            XCTAssert(contract != nil, "Failed to create ERC20 contract from ABI")
-//            var options = Web3Options.defaultOptions()
-//            options.from = userAddress
-//            let parameters = [userAddress] as [AnyObject]
-//            let transactionIntermediate = contract?.method("balanceOf", parameters:parameters, options: options)
-//            let callback = { (res: Result<AnyObject, Web3Error>) -> () in
-//                switch res {
-//                case .success(let balanceResult):
-//                    guard let result = balanceResult as? [String: Any] else {
-//                        XCTFail()
-//                        break
-//                    }
-//                    guard let bal = result["balance"] as? BigUInt else {
-//                        XCTFail()
-//                        break
-//                    }
-//                    print("Balance of " + tokenSymbol + " is " + String(bal))
-//                case .failure(let error):
-//                    print(error)
-//                    XCTFail()
-////                    fatalError()
-//                }
-//                OperationQueue.current?.underlyingQueue?.async {
-//                    expected = expected - 1
-////                    print(String(expected) + " tokens left to update")
-//                    if expected == 0 {
-//                        semaphore.signal()
-//                    }
-//                }
-//
-//            }
-//            transactionIntermediate?.call(options: options, onBlock: "latest", callback: callback, queue: web3.queue)
-//        }
-//        let _ = semaphore.wait(timeout: .distantFuture)
-//    }
-//
-//    func testGetAllTokenNames()
-//    {
-//        //        let semaphore = DispatchSemaphore(value: 0)
-//        let url = URL.init(string: "https://raw.githubusercontent.com/kvhnuke/etherwallet/mercury/app/scripts/tokens/ethTokens.json")
-//        let tokensData = try! Data.init(contentsOf: url!)
-//        let tokensJSON = try! JSONSerialization.jsonObject(with: tokensData, options: []) as! [[String: Any]]
-//        let jsonString = "[{\"constant\":true,\"inputs\":[],\"name\":\"name\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_spender\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"approve\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"totalSupply\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_from\",\"type\":\"address\"},{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"transferFrom\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"decimals\",\"outputs\":[{\"name\":\"\",\"type\":\"uint8\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"version\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"name\":\"balance\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"symbol\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"transfer\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_spender\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"},{\"name\":\"_extraData\",\"type\":\"bytes\"}],\"name\":\"approveAndCall\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\"},{\"name\":\"_spender\",\"type\":\"address\"}],\"name\":\"allowance\",\"outputs\":[{\"name\":\"remaining\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"_initialAmount\",\"type\":\"uint256\"},{\"name\":\"_tokenName\",\"type\":\"string\"},{\"name\":\"_decimalUnits\",\"type\":\"uint8\"},{\"name\":\"_tokenSymbol\",\"type\":\"string\"}],\"type\":\"constructor\"},{\"payable\":false,\"type\":\"fallback\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Transfer\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"_owner\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"_spender\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Approval\",\"type\":\"event\"},]"
-//        let web3 = Web3.InfuraMainnetWeb3()
-//        let userAddress = EthereumAddress("0xc011bf81e3f88931cf331856e45fab6b6450e54c")!
-//        var expected = tokensJSON.count
-//        print(String(expected) + " tokens to update")
-//        let semaphore = DispatchSemaphore(value: 0)
-//        for token in tokensJSON {
-//            let tokenSymbol = token["symbol"] as! String
-//            let tokenAddress = EthereumAddress(token["address"] as! String)
-//            let contract = web3.contract(jsonString, at: tokenAddress, abiVersion: 2)
-//            XCTAssert(contract != nil, "Failed to create ERC20 contract from ABI")
-//            var options = Web3Options.defaultOptions()
-//            options.from = userAddress
-//            let transactionIntermediate = contract?.method("name", options: options)
-//            let callback = { (res: Result<AnyObject, Web3Error>) -> () in
-//                switch res {
-//                case .success(let balanceResult):
-//                    guard let result = balanceResult as? [String: Any] else {
-//                        XCTFail()
-//                        break
-//                    }
-//                    guard let bal = result["0"] as? String else {
-//                        XCTFail()
-//                        break
-//                    }
-//                    print("Name of " + tokenSymbol + " is " + String(bal))
-//                case .failure(let error):
-//                    print(error)
-//                    print("Name of " + tokenSymbol + " is undefined")
-////                    XCTFail()
-////                    fatalError()
-//                }
-//                OperationQueue.current?.underlyingQueue?.async {
-//                    expected = expected - 1
-//                    if expected == 0 {
-//                        semaphore.signal()
-//                    }
-//                }
-//
-//            }
-//            transactionIntermediate?.call(options: options, onBlock: "latest", callback: callback, queue: web3.queue)
-//        }
-//        let _ = semaphore.wait(timeout: .distantFuture)
-//    }
-//
-//    func testEthSendOperationsExample() {
-//        let semaphore = DispatchSemaphore(value: 0)
-//        var fail = true;
-//        let web3 = Web3.InfuraRinkebyWeb3()
-//        let sendToAddress = EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")!
-//        let tempKeystore = try! EthereumKeystoreV3(password: "")
-//        let keystoreManager = KeystoreManager([tempKeystore!])
-//        web3.addKeystoreManager(keystoreManager)
-//        let contract = web3.contract(Web3.Utils.coldWalletABI, at: sendToAddress, abiVersion: 2)
-//        var options = Web3Options.defaultOptions()
-//        options.value = Web3.Utils.parseToBigUInt("1.0", units: .eth)
-//        options.from = keystoreManager.addresses?.first
-//        let intermediate = contract?.method("fallback", options: options)
-//        let callback = { (res: Result<AnyObject, Web3Error>) -> () in
-//            switch res {
-//            case .success(let result):
-//                print(result)
-//                fail = false
-//            case .failure(let error):
-//                print(error)
-//                if case .nodeError(_) = error {
-//                    fail = false
-//                    break
-//                }
-//                XCTFail()
-////                fatalError()
-//            }
-//            semaphore.signal()
-//        }
-//        intermediate?.send(password: "", options: options, callback: callback, queue: web3.queue)
-//
-//        let _ = semaphore.wait(timeout: .distantFuture)
-//        XCTAssertTrue(!fail)
-//    }
 
     func testUserCaseEventParsing() {
         let contractAddress = EthereumAddress("0x7ff546aaccd379d2d1f241e1d29cdd61d4d50778")