relayer: Removed uses of chrono

informalsystems · Dec 13, 2021 · 672d206 · 672d206
1 parent d101aaf
commit 672d206
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
@@ -25,7 +25,6 @@ ibc           = { version = "0.9.0", path = "../modules" }
 ibc-proto     = { version = "0.13.0", path = "../proto" }
 ibc-telemetry = { version = "0.9.0", path = "../telemetry", optional = true }
 
-chrono = { version = "0.4.19", default-features = false, features = ["clock"] }
 subtle-encoding = "0.5"
 async-trait = "0.1.50"
 humantime-serde = "1.0.0"

diff --git a/relayer/src/chain/cosmos.rs b/relayer/src/chain/cosmos.rs
@@ -12,7 +12,6 @@ use std::{fmt, thread, time::Instant};
 
 use bech32::{ToBase32, Variant};
 use bitcoin::hashes::hex::ToHex;
-use chrono::DateTime;
 use itertools::Itertools;
 use prost::Message;
 use prost_types::Any;
@@ -56,7 +55,6 @@ use ibc::core::ics24_host::{ClientUpgradePath, Path, IBC_QUERY_PATH, SDK_UPGRADE
 use ibc::events::{from_tx_response_event, IbcEvent};
 use ibc::query::{QueryTxHash, QueryTxRequest};
 use ibc::signer::Signer;
-use ibc::timestamp::Timestamp;
 use ibc::Height as ICSHeight;
 use ibc::{downcast, query::QueryBlockRequest};
 use ibc_proto::cosmos::auth::v1beta1::{BaseAccount, EthAccount, QueryAccountRequest};
@@ -1098,15 +1096,15 @@ impl ChainEndpoint for CosmosSdkChain {
         crate::time!("query_status");
         let status = self.status()?;
 
-        let time = DateTime::from(status.sync_info.latest_block_time);
+        let time = status.sync_info.latest_block_time;
         let height = ICSHeight {
             revision_number: ChainId::chain_version(status.node_info.network.as_str()),
             revision_height: u64::from(status.sync_info.latest_block_height),
         };
 
         Ok(StatusResponse {
             height,
-            timestamp: Timestamp::from_datetime(time),
+            timestamp: time.into(),
         })
     }
 

diff --git a/relayer/src/foreign_client.rs b/relayer/src/foreign_client.rs
@@ -2,7 +2,6 @@ use core::{fmt, time::Duration};
 use std::thread;
 use std::time::Instant;
 
-use chrono::Utc;
 use itertools::Itertools;
 use prost_types::Any;
 use tracing::{debug, error, info, trace, warn};
@@ -569,7 +568,7 @@ impl<DstChain: ChainHandle, SrcChain: ChainHandle> ForeignClient<DstChain, SrcCh
         // we can backoff between subsequent client updates.
         let refresh_window = client_state.refresh_period();
         // Compute the duration since the last update of this client
-        let elapsed = Timestamp::from_datetime(Utc::now()).duration_since(&last_update_time);
+        let elapsed = Timestamp::now().duration_since(&last_update_time);
 
         if client_state.is_frozen() || client_state.expired(elapsed.unwrap_or_default()) {
             return Err(ForeignClientError::expired_or_frozen(

diff --git a/relayer/src/transfer.rs b/relayer/src/transfer.rs
@@ -2,7 +2,6 @@ use core::fmt::{Display, Formatter};
 use core::str::FromStr;
 use core::time::Duration;
 
-use chrono::Utc;
 use flex_error::{define_error, DetailOnly};
 use ibc::applications::ics20_fungible_token_transfer::msgs::transfer::MsgTransfer;
 use ibc::core::ics24_host::identifier::{ChainId, ChannelId, PortId};
@@ -98,8 +97,7 @@ pub fn build_and_send_transfer_messages<SrcChain: ChainHandle, DstChain: ChainHa
     let timeout_timestamp = if opts.timeout_seconds == Duration::from_secs(0) {
         Timestamp::none()
     } else {
-        (Timestamp::from_datetime(Utc::now()) + opts.timeout_seconds)
-            .map_err(PacketError::timestamp_overflow)?
+        (Timestamp::now() + opts.timeout_seconds).map_err(PacketError::timestamp_overflow)?
     };
 
     let timeout_height = if opts.timeout_height_offset == 0 {