From 3a7ea47b2dfb8f460b8ab2e8bc480a6c6b74d49a Mon Sep 17 00:00:00 2001 From: Stan Bondi Date: Thu, 1 Feb 2024 15:30:28 +0400 Subject: [PATCH] fix(engine)!: determinism bug with log entries --- dan_layer/engine_types/src/logs.rs | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dan_layer/engine_types/src/logs.rs b/dan_layer/engine_types/src/logs.rs index 874ba2dc7..cb1522b5a 100644 --- a/dan_layer/engine_types/src/logs.rs +++ b/dan_layer/engine_types/src/logs.rs @@ -20,10 +20,7 @@ // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -use std::{ - fmt::Display, - time::{Duration, SystemTime, UNIX_EPOCH}, -}; +use std::fmt::Display; use serde::{Deserialize, Serialize}; pub use tari_template_lib::args::LogLevel; @@ -33,29 +30,18 @@ use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] #[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))] pub struct LogEntry { - #[cfg_attr(feature = "ts", ts(type = "number"))] - pub timestamp: u64, pub message: String, pub level: LogLevel, } impl LogEntry { pub fn new(level: LogLevel, message: String) -> Self { - let now = SystemTime::now() - .duration_since(UNIX_EPOCH) - // If the errors, the clock has been set before the UNIX_EPOCH - .unwrap_or_else(|_| Duration::from_secs(0)) - .as_secs(); - Self { - timestamp: now, - message, - level, - } + Self { message, level } } } impl Display for LogEntry { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{} {} {}", self.timestamp, self.level, self.message) + write!(f, "{} {}", self.level, self.message) } }