Merge pull request #347 from BaldyAsh/tests-local-fix

Update local Tests and refactoring

Author: TonioMacaronio

Sources/web3swift/Web3/Web3.swift

@@ -76,4 +76,10 @@ public struct Web3 {
         return web3(provider: infura)
     }
 
+    /// Initialized Web3 instance bound to Infura's kovan provider.
+    public static func InfuraKovanWeb3(accessToken: String? = nil) -> web3 {
+        let infura = InfuraProvider(Networks.Kovan, accessToken: accessToken)!
+        return web3(provider: infura)
+    }
+    
 }

Tests/web3swiftTests/infura_tests/web3swift_ENS_Tests.swift

@@ -0,0 +1,105 @@
+//  web3swift
+//
+//  Created by Alex Vlasov.
+//  Copyright © 2018 Alex Vlasov. All rights reserved.
+//
+
+import XCTest
+
+@testable import web3swift
+
+// MARK: Works only with network connection
+class web3swift_ENS_Tests: XCTestCase {
+    
+    func testDomainNormalization() throws {
+        let normalizedString = NameHash.normalizeDomainName("example.ens")
+        print(normalizedString!)
+    }
+    
+    func testNameHash() throws {
+        XCTAssertEqual(NameHash.nameHash(""), Data.fromHex("0x0000000000000000000000000000000000000000000000000000000000000000"))
+        XCTAssertEqual(NameHash.nameHash("eth"), Data.fromHex("0x93cdeb708b7545dc668eb9280176169d1c33cfd8ed6f04690a0bcc88a93fc4ae"))
+        XCTAssertEqual(NameHash.nameHash("foo.eth"), Data.fromHex("0xde9b09fd7c5f901e23a3f19fecc54828e9c848539801e86591bd9801b019f84f"))
+    }
+    
+    func testResolverAddress() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let address = try ens?.registry.getResolver(forDomain: domain).resolverContractAddress
+        XCTAssertEqual(address?.address.lowercased(), "0x5ffc014343cd971b7eb70732021e26c35b744cc4")
+    }
+    
+    func testResolver() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let address = try ens?.getAddress(forNode: domain)
+        XCTAssertEqual(address?.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
+    }
+    
+    func testSupportsInterface() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let resolver = try ens?.registry.getResolver(forDomain: domain)
+        let isAddrSupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.addr.hash())
+        let isNameSupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.name.hash())
+        let isABIsupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.ABI.hash())
+        let isPubkeySupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.pubkey.hash())
+        XCTAssertEqual(isAddrSupports, true)
+        XCTAssertEqual(isNameSupports, true)
+        XCTAssertEqual(isABIsupports, true)
+        XCTAssertEqual(isPubkeySupports, true)
+    }
+    
+    func testABI() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let resolver = try ens?.registry.getResolver(forDomain: domain)
+        if let isABIsupported = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.ABI.hash()),
+            isABIsupported {
+            let res = try resolver?.getContractABI(forNode: domain, contentType: .zlibCompressedJSON)
+            XCTAssert(res?.0 == 0)
+            XCTAssert(res?.1.count == 0)
+        } else {
+            XCTFail()
+        }
+    }
+    
+    func testOwner() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let owner = try ens?.registry.getOwner(node: domain)
+        XCTAssertEqual("0xc67247454e720328714c4e17bec7640572657bee", owner?.address.lowercased())
+    }
+    
+    func testTTL() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let ttl = try ens?.registry.getTTL(node: domain)
+        print(ttl!.description)
+    }
+    
+    func testGetAddress() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let resolver = try ens?.registry.getResolver(forDomain: domain)
+        let address = try resolver?.getAddress(forNode: domain)
+        XCTAssertEqual(address?.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
+    }
+    
+    func testGetPubkey() throws {
+        let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
+        let ens = ENS(web3: web)
+        let domain = "somename.eth"
+        let resolver = try ens?.registry.getResolver(forDomain: domain)
+        let pubkey = try resolver?.getPublicKey(forNode: domain)
+        XCTAssert(pubkey?.x == "0x0000000000000000000000000000000000000000000000000000000000000000")
+        XCTAssert(pubkey?.y == "0x0000000000000000000000000000000000000000000000000000000000000000")
+    }
+}

Tests/web3swiftTests/web3swift_ST20AndSecurityToken_Tests.swift renamed to Tests/web3swiftTests/infura_tests/web3swift_ST20AndSecurityToken_Tests.swift

@@ -7,14 +7,14 @@
 //
 import XCTest
 import BigInt
-//import EthereumAddress
 
 @testable import web3swift
 
+// MARK: Works only with network connection
 class web3swift_ST20AndSecurityToken_Tests: XCTestCase {
 
-    func testERC20TokenCreation() {
-        let web3 = try! Web3.new(URL(string: "https://kovan.infura.io")!)
+    func testERC20TokenCreation() throws {
+        let web3 = Web3.InfuraKovanWeb3()
         let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
         let st20token = ST20.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
         st20token.readProperties()
@@ -24,7 +24,7 @@ class web3swift_ST20AndSecurityToken_Tests: XCTestCase {
     }
 
     func testST20tokenBalanceAndAllowance() throws {
-        let web3 = try! Web3.new(URL(string: "https://kovan.infura.io")!)
+        let web3 = Web3.InfuraKovanWeb3()
         let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
         let st20token = ST20.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
         let userAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
@@ -35,7 +35,7 @@ class web3swift_ST20AndSecurityToken_Tests: XCTestCase {
     }
 
     func testSecurityTokenInvestors() throws {
-        let web3 = try! Web3.new(URL(string: "https://kovan.infura.io")!)
+        let web3 = Web3.InfuraKovanWeb3()
         let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
         let stoken = SecurityToken.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
         let investorsCount = try stoken.investorCount()
@@ -44,7 +44,7 @@ class web3swift_ST20AndSecurityToken_Tests: XCTestCase {
     }
 
     func testSecurityTokenGranularity() throws {
-        let web3 = try! Web3.new(URL(string: "https://kovan.infura.io")!)
+        let web3 = Web3.InfuraKovanWeb3()
         let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
         let stoken = SecurityToken.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
         let granularity = try stoken.getGranularity()

Tests/web3swiftTests/web3swift_Websockets_Tests.swift renamed to Tests/web3swiftTests/infura_tests/web3swift_Websockets_Tests.swift

@@ -40,6 +40,7 @@ class SpyDelegate: Web3SocketDelegate {
     }
 }
 
+// MARK: Works only with network connection
 class web3swift_websocket_Tests: XCTestCase {
 
     let spyDelegate = SpyDelegate()
@@ -75,7 +76,7 @@ class web3swift_websocket_Tests: XCTestCase {
         }
         self.socketProvider = socketProvider
         spyDelegate.asyncExpectation = expectation(description: "Delegate called")
-        try! self.socketProvider!.subscribeOnLogs(addresses: [EthereumAddress("0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359")!], topics: nil)
+        try! self.socketProvider!.subscribeOnLogs(addresses: [EthereumAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48")!], topics: nil)
         //        DispatchQueue.main.asyncAfter(deadline: .now()+5) { [unowned self] in
         //            try! self.socketProvider!.subscribeOnNewPendingTransactions()
         //        }
@@ -123,7 +124,7 @@ class web3swift_websocket_Tests: XCTestCase {
         }
         self.socketProvider = socketProvider
         spyDelegate.asyncExpectation = expectation(description: "Delegate called")
-        try! self.socketProvider?.setFilterAndGetLogs(method: .newFilter, address: EthereumAddress("0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359")!, fromBlock: .earliest, toBlock: .latest, topics: nil)
+        try! self.socketProvider?.setFilterAndGetLogs(method: .newFilter, address: EthereumAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48")!, fromBlock: .earliest, toBlock: .latest, topics: nil)
         //        DispatchQueue.main.asyncAfter(deadline: .now()+5) { [unowned self] in
         //            try! self.socketProvider!.subscribeOnNewPendingTransactions()
         //        }

Tests/web3swiftTests/infura_tests/web3swift_infura_Tests.swift

@@ -0,0 +1,111 @@
+//  web3swift
+//
+//  Created by Alex Vlasov.
+//  Copyright © 2018 Alex Vlasov. All rights reserved.
+//
+
+import XCTest
+
+@testable import web3swift
+
+// MARK: Works only with network connection
+class web3swift_infura_Tests: XCTestCase {
+    
+    func testGetBalance() throws {
+        do {
+            let web3 = Web3.InfuraMainnetWeb3()
+            let address = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
+            let balance = try web3.eth.getBalance(address: address)
+            let balString = Web3.Utils.formatToEthereumUnits(balance, toUnits: .eth, decimals: 3)
+            print(balString!)
+        } catch {
+            XCTFail()
+        }
+    }
+    
+    func testGetBlockByHash() throws {
+        do {
+            let web3 = Web3.InfuraMainnetWeb3()
+            let result = try web3.eth.getBlockByHash("0x6d05ba24da6b7a1af22dc6cc2a1fe42f58b2a5ea4c406b19c8cf672ed8ec0695", fullTransactions: true)
+            print(result)
+        } catch {
+            XCTFail()
+        }
+    }
+    
+    func testGetBlockByNumber1() throws {
+        let web3 = Web3.InfuraMainnetWeb3()
+        let result = try web3.eth.getBlockByNumber("latest", fullTransactions: true)
+        print(result)
+    }
+    
+    func testGetBlockByNumber2() throws {
+        let web3 = Web3.InfuraMainnetWeb3()
+        let result = try web3.eth.getBlockByNumber(UInt64(5184323), fullTransactions: true)
+        print(result)
+        let transactions = result.transactions
+        for transaction in transactions {
+            switch transaction {
+            case .transaction(let tx):
+                print(String(describing: tx))
+            default:
+                break
+            }
+        }
+    }
+    
+    func testGetBlockByNumber3() throws {
+        do {
+            let web3 = Web3.InfuraMainnetWeb3()
+            let _ = try web3.eth.getBlockByNumber(UInt64(1000000000), fullTransactions: true)
+            XCTFail()
+        } catch {
+            
+        }
+    }
+    
+    func testGasPrice() throws {
+        let web3 = Web3.InfuraMainnetWeb3()
+        let response = try web3.eth.getGasPrice()
+        print(response)
+    }
+    
+    func testGetIndexedEventsPromise() throws {
+        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 contract = web3.contract(jsonString, at: nil, abiVersion: 2)
+        var filter = EventFilter()
+        filter.fromBlock = .blockNumber(UInt64(5200120))
+        filter.toBlock = .blockNumber(UInt64(5200120))
+        filter.addresses = [EthereumAddress("0x53066cddbc0099eb6c96785d9b3df2aaeede5da3")!]
+        filter.parameterFilters = [([EthereumAddress("0xefdcf2c36f3756ce7247628afdb632fa4ee12ec5")!] as [EventFilterable]), (nil as [EventFilterable]?)]
+        let eventParserResult = try contract!.getIndexedEventsPromise(eventName: "Transfer", filter: filter, joinWithReceipts: true).wait()
+        print(eventParserResult)
+        XCTAssert(eventParserResult.count == 2)
+        XCTAssert(eventParserResult[0].transactionReceipt != nil)
+        XCTAssert(eventParserResult[0].eventLog != nil)
+    }
+    
+    func testEventParsingBlockByNumberPromise() throws {
+        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 contract = web3.contract(jsonString, at: nil, abiVersion: 2)
+        var filter = EventFilter()
+        filter.addresses = [EthereumAddress("0x53066cddbc0099eb6c96785d9b3df2aaeede5da3")!]
+        filter.parameterFilters = [([EthereumAddress("0xefdcf2c36f3756ce7247628afdb632fa4ee12ec5")!] as [EventFilterable]), ([EthereumAddress("0xd5395c132c791a7f46fa8fc27f0ab6bacd824484")!] as [EventFilterable])]
+        guard let eventParser = contract?.createEventParser("Transfer", filter: filter) else {return XCTFail()}
+        let present = try eventParser.parseBlockByNumberPromise(UInt64(5200120)).wait()
+        print(present)
+        XCTAssert(present.count == 1)
+    }
+    
+    func testUserCaseEventParsing() throws {
+        let contractAddress = EthereumAddress("0x7ff546aaccd379d2d1f241e1d29cdd61d4d50778")
+        let jsonString = "[{\"constant\":false,\"inputs\":[{\"name\":\"_id\",\"type\":\"string\"}],\"name\":\"deposit\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_id\",\"type\":\"string\"},{\"indexed\":true,\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Deposit\",\"type\":\"event\"}]"
+        let web3 = Web3.InfuraRinkebyWeb3()
+        let contract = web3.contract(jsonString, at: contractAddress, abiVersion: 2)
+        guard let eventParser = contract?.createEventParser("Deposit", filter: nil) else {return XCTFail()}
+        let pres = try eventParser.parseBlockByNumber(UInt64(2138657))
+        XCTAssert(pres.count == 1)
+    }
+}