[util] Change GetMockTime to return chrono type instead of int

amitiuttarwar · amitiuttarwar · commit df6a5fc1dff3 · 2021-02-16T12:23:00.000-08:00
diff --git a/src/logging.cpp b/src/logging.cpp
@@ -203,9 +203,9 @@ std::string BCLog::Logger::LogTimestampStr(const std::string& str)
             strStamped.pop_back();
             strStamped += strprintf(".%06dZ", nTimeMicros%1000000);
         }
-        int64_t mocktime = GetMockTime();
-        if (mocktime) {
-            strStamped += " (mocktime: " + FormatISO8601DateTime(mocktime) + ")";
+        std::chrono::seconds mocktime = GetMockTime();
+        if (mocktime > 0s) {
+            strStamped += " (mocktime: " + FormatISO8601DateTime(count_seconds(mocktime)) + ")";
         }
         strStamped += ' ' + str;
     } else
diff --git a/src/util/time.cpp b/src/util/time.cpp
@@ -53,9 +53,9 @@ void SetMockTime(int64_t nMockTimeIn)
     nMockTime.store(nMockTimeIn, std::memory_order_relaxed);
 }
 
-int64_t GetMockTime()
+std::chrono::seconds GetMockTime()
 {
-    return nMockTime.load(std::memory_order_relaxed);
+    return std::chrono::seconds(nMockTime.load(std::memory_order_relaxed));
 }
 
 int64_t GetTimeMillis()
diff --git a/src/util/time.h b/src/util/time.h
@@ -45,8 +45,9 @@ int64_t GetSystemTimeInSeconds(); // Like GetTime(), but not mockable
 
 /** For testing. Set e.g. with the setmocktime rpc, or -mocktime argument */
 void SetMockTime(int64_t nMockTimeIn);
+
 /** For testing */
-int64_t GetMockTime();
+std::chrono::seconds GetMockTime();
 
 /** Return system time (or mocked time, if set) */
 template <typename T>

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,9 @@ std::string BCLog::Logger::LogTimestampStr(const std::string& str)`
`203`	`203`	`strStamped.pop_back();`
`204`	`204`	`strStamped += strprintf(".%06dZ", nTimeMicros%1000000);`
`205`	`205`	`}`
`206`		`- int64_t mocktime = GetMockTime();`
`207`		`- if (mocktime) {`
`208`		`- strStamped += " (mocktime: " + FormatISO8601DateTime(mocktime) + ")";`
	`206`	`+ std::chrono::seconds mocktime = GetMockTime();`
	`207`	`+ if (mocktime > 0s) {`
	`208`	`+ strStamped += " (mocktime: " + FormatISO8601DateTime(count_seconds(mocktime)) + ")";`
`209`	`209`	`}`
`210`	`210`	`strStamped += ' ' + str;`
`211`	`211`	`} else`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ void SetMockTime(int64_t nMockTimeIn)`
`53`	`53`	`nMockTime.store(nMockTimeIn, std::memory_order_relaxed);`
`54`	`54`	`}`
`55`	`55`
`56`		`-int64_t GetMockTime()`
	`56`	`+std::chrono::seconds GetMockTime()`
`57`	`57`	`{`
`58`		`- return nMockTime.load(std::memory_order_relaxed);`
	`58`	`+ return std::chrono::seconds(nMockTime.load(std::memory_order_relaxed));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`int64_t GetTimeMillis()`