Merge pull request #67 from BANKEX/develop

Event parsing example from user case

Author: shamatar

web3swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "web3swift"
-s.version          = "0.5.4"
+s.version          = "0.5.5"
 s.summary          = "Web3 implementation in vanilla Swift for iOS ans macOS"
 
 s.description      = <<-DESC

web3swiftTests/web3swiftTests.swift

@@ -89,12 +89,14 @@ class web3swiftTests: XCTestCase {
     }
 
     func testCombiningPublicKeys() {
-        let priv1 = Data.randomBytes(length: 32)!
+        let priv1 = Data(repeating: 0x01, count: 32)
         let pub1 = Web3.Utils.privateToPublic(priv1, compressed: true)!
-        let priv2 = Data.randomBytes(length: 32)!
+        let priv2 = Data(repeating: 0x02, count: 32)
         let pub2 = Web3.Utils.privateToPublic(priv2, compressed: true)!
         let combined = SECP256K1.combineSerializedPublicKeys(keys: [pub1, pub2], outputCompressed: true)
-        XCTAssert(combined != nil)
+        let compinedPriv = Data(repeating: 0x03, count: 32)
+        let compinedPub = Web3.Utils.privateToPublic(compinedPriv, compressed: true)
+        XCTAssert(compinedPub == combined)
     }
 
     func testBIP39 () {
@@ -2055,14 +2057,25 @@ class web3swiftTests: XCTestCase {
         switch result {
         case .success(let res):
             guard let signer = res["signer"]! as? EthereumAddress else {return XCTFail()}
+            print(signer)
             XCTAssert(signer == expectedAddress)
         case .failure(let error):
             print(error)
             XCTFail()
         }
     }
 
-    
+    func testUserCaseEventParsing() {
+        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 present = eventParser.parseBlockByNumber(UInt64(2138657))
+        guard case .success(let pres) = present else {return XCTFail()}
+        print(pres)
+        XCTAssert(pres.count == 1)
+    }
 
     func testPerformanceExample() {
         // This is an example of a performance test case.