Added saf message duration

tari-project · Mar 11, 2021 · f01076c · f01076c
1 parent 85440f0
commit f01076c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/MobileWallet/TariLib/TariLib.swift b/MobileWallet/TariLib/TariLib.swift
@@ -117,7 +117,8 @@ class TariLib {
                databaseFolderPath: databaseDirectory.path,
                databaseName: TariLib.databaseName,
                publicAddress: publicAddress,
-               discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec
+               discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec,
+               safMessageDurationSec: TariSettings.shared.safMessageDurationSec
             )
         } catch {
             TariLogger.error("Failed to create comms config", error: error)

diff --git a/MobileWallet/TariLib/Wrappers/CommsConfig.swift b/MobileWallet/TariLib/Wrappers/CommsConfig.swift
@@ -54,7 +54,7 @@ class CommsConfig {
     var dbPath: String
     var dbName: String
 
-    init(transport: TransportType, databaseFolderPath: String, databaseName: String, publicAddress: String, discoveryTimeoutSec: UInt64) throws {
+    init(transport: TransportType, databaseFolderPath: String, databaseName: String, publicAddress: String, discoveryTimeoutSec: UInt64, safMessageDurationSec: UInt64) throws {
         dbPath = databaseFolderPath
         dbName = databaseName
         var errorCode: Int32 = -1
@@ -68,6 +68,7 @@ class CommsConfig {
                             db,
                             path,
                             discoveryTimeoutSec,
+                            safMessageDurationSec,
                             error
                         )
                     })

diff --git a/MobileWallet/TariLib/Wrappers/Utils/TariSettings.swift b/MobileWallet/TariLib/Wrappers/Utils/TariSettings.swift
@@ -68,6 +68,7 @@ struct TariSettings {
 
     let network: TariNetwork = .stibbons //TODO this will come from a build config
     let discoveryTimeoutSec: UInt64 = 20
+    let safMessageDurationSec: UInt64 = 10800
     let deeplinkURI = "tari"
 
     let faucetServer = "https://faucet.tari.com"

diff --git a/MobileWallet/TariLib/wallet.h b/MobileWallet/TariLib/wallet.h
@@ -365,6 +365,7 @@ struct TariCommsConfig *comms_config_create(const char *public_address,
                                      const char *database_name,
                                      const char *datastore_path,
                                      unsigned long long discovery_timeout_in_secs,
+                                     unsigned long long saf_message_duration_in_secs,
                                      int* error_out);
 
 // Set the Comms Secret Key for an existing TariCommsConfig. Usually this key is maintained by the backend but if it is required to set a specific

diff --git a/MobileWalletTests/TariLibWrapperTests.swift b/MobileWalletTests/TariLibWrapperTests.swift
@@ -374,7 +374,8 @@ class TariLibWrapperTests: XCTestCase {
                     databaseFolderPath: TariSettings.testStoragePath,
                     databaseName: self.dbName,
                     publicAddress: address,
-                    discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec
+                    discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec,
+                    safMessageDurationSec: TariSettings.shared.safMessageDurationSec
                 )
             } catch {
                 completion(nil, error)
@@ -440,7 +441,8 @@ class TariLibWrapperTests: XCTestCase {
                 databaseFolderPath: databaseFolderPath,
                 databaseName: dbName,
                 publicAddress: address,
-                discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec
+                discoveryTimeoutSec: TariSettings.shared.discoveryTimeoutSec,
+                safMessageDurationSec: TariSettings.shared.safMessageDurationSec
             )
 
             if privateHex != nil {
@@ -512,7 +514,7 @@ class TariLibWrapperTests: XCTestCase {
                 XCTFail(statusError!.localizedDescription)
             }
 
-            XCTAssertEqual(status, .mined)
+            XCTAssertEqual(status, .minedConfirmed)
         } catch {
             XCTFail(error.localizedDescription)
         }