grin v5.3 (0135) more chrono warnings, update cursive lib (mimblewimb…

…le#3778)
mwcproject · Jun 21, 2024 · 3f25b81 · 3f25b81
1 parent 0e41374
commit 3f25b81
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/core/src/core/block.rs b/core/src/core/block.rs
@@ -240,7 +240,7 @@ impl Default for BlockHeader {
 		BlockHeader {
 			version: HeaderVersion(1),
 			height: 0,
-			timestamp: DateTime::<Utc>::from_utc(
+			timestamp: DateTime::from_naive_utc_and_offset(
 				NaiveDateTime::from_timestamp_opt(0, 0).unwrap(),
 				Utc,
 			),
@@ -325,7 +325,7 @@ fn read_block_header<R: Reader>(reader: &mut R) -> Result<BlockHeader, ser::Erro
 	Ok(BlockHeader {
 		version,
 		height,
-		timestamp: DateTime::<Utc>::from_utc(ts.unwrap(), Utc),
+		timestamp: DateTime::from_naive_utc_and_offset(ts.unwrap(), Utc),
 		prev_hash,
 		prev_root,
 		output_root,
@@ -702,7 +702,7 @@ impl Block {
 			return Err(Error::Other("Converting Utc::now() into timestamp".into()));
 		}
 
-		let timestamp = DateTime::<Utc>::from_utc(ts.unwrap(), Utc);
+		let timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap(), Utc);
 		// Now build the block with all the above information.
 		// Note: We have not validated the block here.
 		// Caller must validate the block as necessary.

diff --git a/core/src/pow.rs b/core/src/pow.rs
@@ -125,8 +125,10 @@ pub fn pow_size(
 		// and if we're back where we started, update the time (changes the hash as
 		// well)
 		if bh.pow.nonce == start_nonce {
-			bh.timestamp =
-				DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp_opt(0, 0).unwrap(), Utc);
+			bh.timestamp = DateTime::from_naive_utc_and_offset(
+				NaiveDateTime::from_timestamp_opt(0, 0).unwrap(),
+				Utc,
+			);
 		}
 	}
 }

diff --git a/servers/src/mining/mine_block.rs b/servers/src/mining/mine_block.rs
@@ -172,7 +172,7 @@ fn build_block(
 	if ts.is_none() {
 		return Err(Error::General("Utc::now into timestamp".into()));
 	}
-	b.header.timestamp = DateTime::<Utc>::from_utc(ts.unwrap(), Utc);
+	b.header.timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap(), Utc);
 
 	debug!(
 		"Built new block with {} inputs and {} outputs, block difficulty: {}, cumulative difficulty {}",

diff --git a/src/bin/tui/mining.rs b/src/bin/tui/mining.rs
@@ -73,7 +73,7 @@ impl TableViewItem<StratumWorkerColumn> for WorkerStats {
 			0,
 		)
 		.unwrap_or_default();
-		let datetime: DateTime<Utc> = DateTime::from_utc(naive_datetime, Utc);
+		let datetime: DateTime<Utc> = DateTime::from_naive_utc_and_offset(naive_datetime, Utc);
 
 		match column {
 			StratumWorkerColumn::Id => self.id.clone(),
@@ -130,7 +130,7 @@ impl TableViewItem<DiffColumn> for DiffBlock {
 	fn to_column(&self, column: DiffColumn) -> String {
 		let naive_datetime =
 			NaiveDateTime::from_timestamp_opt(self.time as i64, 0).unwrap_or_default();
-		let datetime: DateTime<Utc> = DateTime::from_utc(naive_datetime, Utc);
+		let datetime: DateTime<Utc> = DateTime::from_naive_utc_and_offset(naive_datetime, Utc);
 
 		match column {
 			DiffColumn::Height => self.block_height.to_string(),

diff --git a/src/bin/tui/status.rs b/src/bin/tui/status.rs
@@ -71,8 +71,11 @@ impl TUIStatusView {
 			SyncStatus::TxHashsetDownload(stat) => {
 				if stat.total_size > 0 {
 					let percent = stat.downloaded_size * 100 / stat.total_size;
-					let start = stat.prev_update_time.timestamp_nanos();
-					let fin = Utc::now().timestamp_nanos();
+					let start = stat
+						.prev_update_time
+						.timestamp_nanos_opt()
+						.unwrap_or_default();
+					let fin = Utc::now().timestamp_nanos_opt().unwrap_or_default();
 					let dur_ms = (fin - start) as f64 * NANO_TO_MILLIS;
 
 					Cow::Owned(format!("Sync step 2/7: Downloading {}(MB) chain state for state sync: {}% at {:.1?}(kB/s)",