diff --git a/Cargo.lock b/Cargo.lock index 54e8bcbf963c00..ef0ca3b1bcf873 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3646,7 +3646,6 @@ dependencies = [ "solana-program-runtime", "solana-sdk", "solana_rbpf", - "time 0.3.5", ] [[package]] @@ -6218,7 +6217,6 @@ dependencies = [ "solana-sdk", "subtle", "thiserror", - "time 0.1.43", "zeroize", ] @@ -6652,15 +6650,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "time" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" -dependencies = [ - "libc", -] - [[package]] name = "time-macros" version = "0.1.1" diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml index 9d11d3dd64a6ea..1f06294937878d 100644 --- a/rbpf-cli/Cargo.toml +++ b/rbpf-cli/Cargo.toml @@ -18,4 +18,3 @@ solana-logger = { path = "../logger", version = "=1.10.0" } solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } solana_rbpf = "=0.2.21" -time = "0.3.5" diff --git a/rbpf-cli/src/main.rs b/rbpf-cli/src/main.rs index 98a2951ba2b229..be056248fce45d 100644 --- a/rbpf-cli/src/main.rs +++ b/rbpf-cli/src/main.rs @@ -22,8 +22,8 @@ use { fs::File, io::{Read, Seek, SeekFrom}, path::Path, + time::Instant, }, - time::Instant, }; #[derive(Serialize, Deserialize, Debug)] @@ -296,7 +296,7 @@ native machine code before execting it in the virtual machine.", let duration = Instant::now() - start_time; println!("Result: {:?}", result); println!("Instruction Count: {}", vm.get_total_instruction_count()); - println!("Execution time: {} us", duration.whole_microseconds()); + println!("Execution time: {} us", duration.as_micros()); if matches.is_present("trace") { println!("Trace is saved in trace.out"); let mut file = File::create("trace.out").unwrap(); diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml index 88e8e341886800..288ad77382b746 100644 --- a/zk-token-sdk/Cargo.toml +++ b/zk-token-sdk/Cargo.toml @@ -33,8 +33,5 @@ subtle = "2" thiserror = "1" zeroize = { version = "1.3", default-features = false, features = ["zeroize_derive"] } -[dev-dependencies] -time = "0.1.40" - [lib] crate-type = ["cdylib", "rlib"] diff --git a/zk-token-sdk/src/encryption/discrete_log.rs b/zk-token-sdk/src/encryption/discrete_log.rs index 5f7c92879eaca4..a704ef80622306 100644 --- a/zk-token-sdk/src/encryption/discrete_log.rs +++ b/zk-token-sdk/src/encryption/discrete_log.rs @@ -113,7 +113,9 @@ impl Iterator for RistrettoIterator { #[cfg(test)] mod tests { - use {super::*, curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT as G}; + use { + super::*, curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT as G, std::time::Instant, + }; #[test] #[allow(non_snake_case)] @@ -147,23 +149,17 @@ mod tests { }; // Very informal measurements for now - let start_precomputation = time::precise_time_s(); + let start_precomputation = Instant::now(); let precomputed_hashmap = decode_u32_precomputation(G); - let end_precomputation = time::precise_time_s(); + let precomputation_secs = start_precomputation.elapsed().as_secs_f64(); - let start_online = time::precise_time_s(); + let start_online = Instant::now(); let computed_amount = instance.decode_u32_online(&precomputed_hashmap).unwrap(); - let end_online = time::precise_time_s(); + let online_secs = start_online.elapsed().as_secs_f64(); assert_eq!(amount, computed_amount); - println!( - "16/16 Split precomputation: {:?} sec", - end_precomputation - start_precomputation - ); - println!( - "16/16 Split online computation: {:?} sec", - end_online - start_online - ); + println!("16/16 Split precomputation: {:?} sec", precomputation_secs); + println!("16/16 Split online computation: {:?} sec", online_secs); } }