Merge pull request #157 from BANKEX/develop

reduce verbosity, make tests more strict

Author: shamatar

Example/web3swiftExample/Podfile.lock

@@ -49,7 +49,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   web3swift:
-    :commit: 670e012c95044e19a186de04d74011f46aff9da7
+    :commit: 8d2cd5d484fb7e1d44dccd6422e19191cd9da024
     :git: https://github.com/bankex/web3swift.git
 
 SPEC CHECKSUMS:

Example/web3swiftExample/Pods/Manifest.lock

@@ -102,8 +102,8 @@ class ViewController: UIViewController {
 //            print("Address mismatch")
 //        }
         guard case .success(let sendingResult) = sendResult else {return}
-        let txid = sendingResult["txhash"]
-        print("On Rinkeby TXid = " + txid!)
+        let txid = sendingResult.hash
+        print("On Rinkeby TXid = " + txid)
 
         //Send ETH on Rinkeby using BIP32 keystore. Should fail due to insufficient balance
         web3Rinkeby.addKeystoreManager(bip32keystoreManager)

Example/web3swiftExample/Pods/web3swift/web3swift/Promises/Classes/Promise+Web3+Contract+GetIndexedEvents.swift

@@ -87,8 +87,8 @@ extension Web3HttpProvider {
         return rp.promise.ensure(on: queue) {
             task = nil
             }.map(on: queue){ (data: Data) throws -> JSONRPCresponseBatch in
-                let debugValue = try JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0))
-                print(debugValue)
+//                let debugValue = try JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0))
+//                print(debugValue)
                 let parsedResponse = try JSONDecoder().decode(JSONRPCresponseBatch.self, from: data)
                 return parsedResponse
         }

Example/web3swiftExample/Pods/web3swift/web3swift/Web3/Classes/Web3+EventParser.swift

@@ -248,9 +248,9 @@ extension web3.web3contract {
             self.web3.queue.addOperation(operation)
         }
 
-        func assemble(password:String = "BANKEXFOUNDATION", options: Web3Options? = nil, onBlock: String = "pending") -> Result<EthereumTransaction, Web3Error> {
+        func assemble(options: Web3Options? = nil, onBlock: String = "pending") -> Result<EthereumTransaction, Web3Error> {
             do {
-                let result = try self.assemblePromise(password:password, options: options, onBlock: onBlock).wait()
+                let result = try self.assemblePromise(options: options, onBlock: onBlock).wait()
                 return Result(result)
             } catch {
                 if let err = error as? Web3Error {
@@ -265,7 +265,7 @@ extension web3.web3contract {
 
 extension web3.web3contract.TransactionIntermediate {
 
-    func assemblePromise(password:String = "BANKEXFOUNDATION", options: Web3Options? = nil, onBlock: String = "pending") -> Promise<EthereumTransaction> {
+    func assemblePromise(options: Web3Options? = nil, onBlock: String = "pending") -> Promise<EthereumTransaction> {
         var assembledTransaction : EthereumTransaction = self.transaction
         let queue = self.web3.requestDispatcher.queue
         let returnPromise = Promise<EthereumTransaction> { seal in
@@ -317,7 +317,7 @@ extension web3.web3contract.TransactionIntermediate {
 
     func sendPromise(password:String = "BANKEXFOUNDATION", options: Web3Options? = nil, onBlock: String = "pending") -> Promise<TransactionSendingResult>{
             let queue = self.web3.requestDispatcher.queue
-            return self.assemblePromise(password: password, options: options, onBlock: onBlock).then(on: queue) { transaction throws -> Promise<TransactionSendingResult> in
+            return self.assemblePromise(options: options, onBlock: onBlock).then(on: queue) { transaction throws -> Promise<TransactionSendingResult> in
                 guard let mergedOptions = Web3Options.merge(self.options, with: options) else {
                     throw Web3Error.inputError("Provided options are invalid")
                 }

Example/web3swiftExample/web3swiftExample/ViewController.swift

@@ -52,6 +52,7 @@ class web3swift_promises_Tests: XCTestCase {
             XCTAssert(esimate == 21000)
         } catch{
             print(error)
+            XCTFail()
         }
     }
 
@@ -72,6 +73,7 @@ class web3swift_promises_Tests: XCTestCase {
             print(result)
         } catch {
             print(error)
+            XCTFail()
         }
     }
 
@@ -85,6 +87,7 @@ class web3swift_promises_Tests: XCTestCase {
             print(String(bal))
         } catch {
             print(error)
+            XCTFail()
         }
     }
 
@@ -105,6 +108,7 @@ class web3swift_promises_Tests: XCTestCase {
             XCTAssert(eventParserResult[0].eventLog != nil)
         }catch {
             print(error)
+            XCTFail()
         }
     }
 
@@ -122,6 +126,7 @@ class web3swift_promises_Tests: XCTestCase {
             XCTAssert(present.count == 1)
         } catch{
             print(error)
+            XCTFail()
         }
     }