first commit after the Devcon. Add more options into the event loop

Author: shamatar

web3swift/Web3/Classes/Web3+Eventloop.swift

@@ -29,14 +29,21 @@ extension web3.Eventloop {
         }
     }
 
-    @objc func runnable() {
+    func runnable() {
         for prop in self.monitoredProperties {
             let queue = prop.queue
             let function = prop.calledFunction
             queue.async {
                 function(self.web3)
             }
         }
+        
+        for prop in self.monitoredUserFunctions {
+            let queue = prop.queue
+            queue.async {
+                prop.functionToRun()
+            }
+        }
     }
 }
 

web3swift/Web3/Classes/Web3+Instance.swift

@@ -166,19 +166,31 @@ public class web3: Web3OptionsInheritable {
     }
 
     public class Eventloop: Web3OptionsInheritable {
+        
         public typealias EventLoopCall = (web3) -> Void
+        public typealias EventLoopContractCall = (web3contract) -> Void
 
         public struct MonitoredProperty {
             public var name: String
             public var queue: DispatchQueue
             public var calledFunction: EventLoopCall
         }
 
+//        public struct MonitoredContract {
+//            public var name: String
+//            public var queue: DispatchQueue
+//            public var calledFunction: EventLoopContractCall
+//        }
+        
         var provider:Web3Provider
         //        weak var web3: web3?
         var web3: web3
         var timer: RepeatingTimer? = nil
-        var monitoredProperties: [MonitoredProperty] = [MonitoredProperty]()
+        
+        public var monitoredProperties: [MonitoredProperty] = [MonitoredProperty]()
+//        public var monitoredContracts: [MonitoredContract] = [MonitoredContract]()
+        public var monitoredUserFunctions: [EventLoopRunnableProtocol] = [EventLoopRunnableProtocol]()
+        
         public var options: Web3Options {
             return self.web3.options
         }

web3swift/Web3/Classes/Web3+Protocols.swift

@@ -75,3 +75,9 @@ public enum Networks {
         }
     }
 }
+
+public protocol EventLoopRunnableProtocol {
+    var name: String {get}
+    var queue: DispatchQueue {get}
+    func functionToRun()
+}

web3swiftTests/web3swift_Eventloop_Tests.swift

@@ -12,7 +12,7 @@ import EthereumAddress
 class web3swift_Eventloop_Tests: XCTestCase {
 
     func testBasicEventLoop() {
-        var ticksToWait = 10
+        var ticksToWait = 5
         let expectation = self.expectation(description: "Waiting")
         func getBlockNumber(_ web3: web3) {
             do {
@@ -30,9 +30,9 @@ class web3swift_Eventloop_Tests: XCTestCase {
         let functionToCall: web3.Eventloop.EventLoopCall = getBlockNumber
         let monitoredProperty = web3.Eventloop.MonitoredProperty.init(name: "onNewBlock", queue: web3main.requestDispatcher.queue, calledFunction: functionToCall)
         web3main.eventLoop.monitoredProperties.append(monitoredProperty)
-        web3main.eventLoop.start(1)
+        web3main.eventLoop.start(5)
 
-        waitForExpectations(timeout: 30, handler: nil)
+        waitForExpectations(timeout: 60, handler: nil)
     }
 
 }