Skip to content

Commit

Permalink
grin v5.3 (0134) warning cleanup (mimblewimble#3759)
Browse files Browse the repository at this point in the history
  • Loading branch information
bayk committed Jun 21, 2024
1 parent ece05c0 commit 0e41374
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 27 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 25 additions & 5 deletions core/src/core/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ impl Default for BlockHeader {
BlockHeader {
version: HeaderVersion(1),
height: 0,
timestamp: DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(0, 0), Utc),
timestamp: DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp_opt(0, 0).unwrap(),
Utc,
),
prev_hash: ZERO_HASH,
prev_root: ZERO_HASH,
output_root: ZERO_HASH,
Expand Down Expand Up @@ -297,19 +300,32 @@ fn read_block_header<R: Reader>(reader: &mut R) -> Result<BlockHeader, ser::Erro
let (output_mmr_size, kernel_mmr_size) = ser_multiread!(reader, read_u64, read_u64);
let pow = ProofOfWork::read(reader)?;

if timestamp > MAX_DATE.and_hms(0, 0, 0).timestamp()
|| timestamp < MIN_DATE.and_hms(0, 0, 0).timestamp()
if timestamp
> chrono::NaiveDate::MAX
.and_hms_opt(0, 0, 0)
.unwrap()
.timestamp()
|| timestamp
< chrono::NaiveDate::MIN
.and_hms_opt(0, 0, 0)
.unwrap()
.timestamp()
{
return Err(ser::Error::CorruptedData(format!(
"Incorrect timestamp {} at block header",
timestamp
)));
}

let ts = NaiveDateTime::from_timestamp_opt(timestamp, 0);
if ts.is_none() {
return Err(ser::Error::CorruptedData("Timestamp is None".into()));
}

Ok(BlockHeader {
version,
height,
timestamp: DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc),
timestamp: DateTime::<Utc>::from_utc(ts.unwrap(), Utc),
prev_hash,
prev_root,
output_root,
Expand Down Expand Up @@ -681,8 +697,12 @@ impl Block {
let version = consensus::header_version(height);

let now = Utc::now().timestamp();
let timestamp = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(now, 0), Utc);
let ts = NaiveDateTime::from_timestamp_opt(now, 0);
if ts.is_none() {
return Err(Error::Other("Converting Utc::now() into timestamp".into()));
}

let timestamp = DateTime::<Utc>::from_utc(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.
Expand Down
6 changes: 3 additions & 3 deletions core/src/genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use util::secp::Signature;
pub fn genesis_dev() -> core::Block {
core::Block::with_header(core::BlockHeader {
height: 0,
timestamp: Utc.ymd(1997, 8, 4).and_hms(0, 0, 0),
timestamp: Utc.with_ymd_and_hms(1997, 8, 4, 0, 0, 0).unwrap(),
pow: ProofOfWork {
nonce: 0,
..Default::default()
Expand All @@ -47,7 +47,7 @@ pub fn genesis_dev() -> core::Block {
pub fn genesis_floo() -> core::Block {
let gen = core::Block::with_header(core::BlockHeader {
height: 0,
timestamp: Utc.ymd(2019, 5, 26).and_hms(16, 30, 1),
timestamp: Utc.with_ymd_and_hms(2019, 5, 26, 16, 30, 1).unwrap(),
prev_root: Hash::from_hex(
"000000000000000000257647fb29ce964ddf2b27c639ae60c4c90fafe5c42e53",
)
Expand Down Expand Up @@ -160,7 +160,7 @@ pub fn genesis_floo() -> core::Block {
pub fn genesis_main() -> core::Block {
let gen = core::Block::with_header(core::BlockHeader {
height: 0,
timestamp: Utc.ymd(2019, 11, 11).and_hms(9, 0, 0),
timestamp: Utc.with_ymd_and_hms(2019, 11, 11, 9, 0, 0).unwrap(),
prev_root: Hash::from_hex(
"00000000000000000004f2fb2ee749923a8131028aeae637070b0b4145617d42",
)
Expand Down
3 changes: 2 additions & 1 deletion core/src/pow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ 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(0, 0), Utc);
bh.timestamp =
DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp_opt(0, 0).unwrap(), Utc);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion p2p/src/peers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ impl Peers {

// Delete defunct peers from storage
let _ = self.store.delete_peers(|peer| {
let diff = now - Utc.timestamp(peer.last_connected, 0);
let diff = now - Utc.timestamp_opt(peer.last_connected, 0).unwrap();

let should_remove = peer.flags == State::Defunct
&& diff > Duration::seconds(global::PEER_EXPIRATION_REMOVE_TIME);
Expand Down
4 changes: 2 additions & 2 deletions servers/src/grin/seed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ pub fn connect_and_monitor(

libp2p_connection::set_seed_list(&seed_list, true);

let mut prev = MIN_DATE.and_hms(0, 0, 0);
let mut prev_expire_check = MIN_DATE.and_hms(0, 0, 0);
let mut prev = DateTime::<Utc>::MIN_UTC;
let mut prev_expire_check = DateTime::<Utc>::MIN_UTC;
let mut prev_ping = Utc::now();
let mut start_attempt = 0;
let mut connecting_history: HashMap<PeerAddr, DateTime<Utc>> = HashMap::new();
Expand Down
6 changes: 5 additions & 1 deletion servers/src/mining/mine_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,11 @@ fn build_block(

b.header.pow.nonce = thread_rng().gen();
b.header.pow.secondary_scaling = difficulty.secondary_scaling;
b.header.timestamp = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(now_sec, 0), Utc);
let ts = NaiveDateTime::from_timestamp_opt(now_sec, 0);
if ts.is_none() {
return Err(Error::General("Utc::now into timestamp".into()));
}
b.header.timestamp = DateTime::<Utc>::from_utc(ts.unwrap(), Utc);

debug!(
"Built new block with {} inputs and {} outputs, block difficulty: {}, cumulative difficulty {}",
Expand Down
8 changes: 5 additions & 3 deletions src/bin/tui/mining.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ impl StratumWorkerColumn {

impl TableViewItem<StratumWorkerColumn> for WorkerStats {
fn to_column(&self, column: StratumWorkerColumn) -> String {
let naive_datetime = NaiveDateTime::from_timestamp(
let naive_datetime = NaiveDateTime::from_timestamp_opt(
self.last_seen
.duration_since(time::UNIX_EPOCH)
.unwrap()
.as_secs() as i64,
0,
);
)
.unwrap_or_default();
let datetime: DateTime<Utc> = DateTime::from_utc(naive_datetime, Utc);

match column {
Expand Down Expand Up @@ -127,7 +128,8 @@ impl DiffColumn {

impl TableViewItem<DiffColumn> for DiffBlock {
fn to_column(&self, column: DiffColumn) -> String {
let naive_datetime = NaiveDateTime::from_timestamp(self.time as i64, 0);
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);

match column {
Expand Down

0 comments on commit 0e41374

Please sign in to comment.