OraclePolicy

neo-project · Nov 20, 2019 · 64c30a8 · 64c30a8
1 parent e2071e7
commit 64c30a8
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/neo.UnitTests/Oracle/UT_OracleService.cs b/neo.UnitTests/Oracle/UT_OracleService.cs
@@ -349,7 +349,8 @@ private OracleExecutionCache ExecuteHTTP1Tx(OracleHTTPRequest request)
 
             using (var snapshot = store.GetSnapshot())
             {
-                var service = new OracleService() { TimeOut = TimeSpan.FromSeconds(2) };
+                var service = new OracleService();
+                service.Policy.Timeout = TimeSpan.FromSeconds(2);
                 return service.Process(snapshot, null, tx, true);
             }
         }

diff --git a/neo/Oracle/OraclePolicy.cs b/neo/Oracle/OraclePolicy.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Neo.Oracle
+{
+    public class OraclePolicy
+    {
+        /// <summary>
+        /// Timeout for serve one request
+        /// </summary>
+        public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(3);
+    }
+}
diff --git a/neo/Oracle/OracleService.cs b/neo/Oracle/OracleService.cs
@@ -3,7 +3,6 @@
 using Neo.Oracle.Protocols.HTTP;
 using Neo.Persistence;
 using Neo.SmartContract;
-using System;
 
 namespace Neo.Oracle
 {
@@ -19,9 +18,9 @@ public class OracleService
         #endregion
 
         /// <summary>
-        /// Timeout
+        /// Policy
         /// </summary>
-        public TimeSpan TimeOut { get; set; } = TimeSpan.FromSeconds(3);
+        public OraclePolicy Policy { get; set; } = new OraclePolicy();
 
         /// <summary>
         /// Process transaction
@@ -66,7 +65,7 @@ private OracleResult ExecuteRequest(UInt256 txHash, OracleRequest request)
         {
             return request switch
             {
-                OracleHTTPRequest http => HTTP.Process(txHash, http, TimeOut),
+                OracleHTTPRequest http => HTTP.Process(txHash, http, Policy),
                 _ => OracleResult.CreateError(txHash, request.Hash, OracleResultError.ServerError),
             };
         }

diff --git a/neo/Oracle/Protocols/HTTP/OracleHTTPProtocol.cs b/neo/Oracle/Protocols/HTTP/OracleHTTPProtocol.cs
@@ -10,9 +10,9 @@ public class OracleHTTPProtocol : IOracleProtocol
         /// </summary>
         /// <param name="txHash">Transaction Hash</param>
         /// <param name="request">Request</param>
-        /// <param name="timeout">Timeout</param>
+        /// <param name="policy">Policy</param>
         /// <returns>Oracle result</returns>
-        public OracleResult Process(UInt256 txHash, OracleRequest request, TimeSpan timeout)
+        public OracleResult Process(UInt256 txHash, OracleRequest request, OraclePolicy policy)
         {
             if (!(request is OracleHTTPRequest httpRequest))
             {
@@ -51,7 +51,7 @@ public OracleResult Process(UInt256 txHash, OracleRequest request, TimeSpan time
 
                 var result = client.SendAsync(req);
 
-                if (!result.Wait(timeout) || result.IsFaulted)
+                if (!result.Wait(policy.Timeout) || result.IsFaulted)
                 {
                     return OracleResult.CreateError(txHash, request.Hash, OracleResultError.Timeout);
                 }
@@ -63,7 +63,7 @@ public OracleResult Process(UInt256 txHash, OracleRequest request, TimeSpan time
 
                 var ret = result.Result.Content.ReadAsStringAsync();
 
-                if (!ret.Wait(timeout) || ret.IsFaulted)
+                if (!ret.Wait(policy.Timeout) || ret.IsFaulted)
                 {
                     return OracleResult.CreateError(txHash, request.Hash, OracleResultError.Timeout);
                 }

diff --git a/neo/Oracle/Protocols/IOracleProtocol.cs b/neo/Oracle/Protocols/IOracleProtocol.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace Neo.Oracle.Protocols
 {
     public interface IOracleProtocol
     {
-        OracleResult Process(UInt256 txHash, OracleRequest request, TimeSpan timeout);
+        OracleResult Process(UInt256 txHash, OracleRequest request, OraclePolicy policy);
     }
 }
diff --git a/neo/Wallets/Wallet.cs b/neo/Wallets/Wallet.cs
@@ -346,7 +346,8 @@ private Transaction MakeTransaction(Snapshot snapshot, byte[] script, Transactio
                         }
                     case OracleExecutionType.SecureOracle:
                         {
-                            var service = new OracleService() { TimeOut = TimeSpan.FromSeconds(2) };
+                            var service = new OracleService();
+                            service.Policy.Timeout = TimeSpan.FromSeconds(2);
                             oracle = service.CreateExecutionCache(tx.Hash);
                             break;
                         }