From 937955788f4b074298dd337fecf12af914dcc84f Mon Sep 17 00:00:00 2001 From: Dmitry Vagner Date: Wed, 21 Sep 2022 20:18:18 -0700 Subject: [PATCH] cargo format --- evm/src/cpu/kernel/tests/ripemd.rs | 19 ++++++++----------- evm/src/memory/segments.rs | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/evm/src/cpu/kernel/tests/ripemd.rs b/evm/src/cpu/kernel/tests/ripemd.rs index b87de8cb..734b7709 100644 --- a/evm/src/cpu/kernel/tests/ripemd.rs +++ b/evm/src/cpu/kernel/tests/ripemd.rs @@ -32,34 +32,31 @@ fn test_ripemd() -> Result<()> { // let kernel = combined_kernel(); // let input: Vec = vec![ - // 0x61, 0x62, - // 0x63, 0x64, 0x65, 0x66, - // 0x67, 0x68, 0x69, 0x6a, - // 0x6b, 0x6c, 0x6d, 0x6e, - // 0x6f, 0x70, 0x71, 0x72, - // 0x73, 0x74, 0x75, 0x76, + // 0x61, 0x62, + // 0x63, 0x64, 0x65, 0x66, + // 0x67, 0x68, 0x69, 0x6a, + // 0x6b, 0x6c, 0x6d, 0x6e, + // 0x6f, 0x70, 0x71, 0x72, + // 0x73, 0x74, 0x75, 0x76, // 0x77, 0x78, 0x79, 0x7a, // ]; // let mut stack_init:Vec = input.iter().map(|&x| U256::from(x as u32)).collect(); // stack_init.push(U256::from_str("0xdeadbeef").unwrap()); - - // let stack_result = run( - // &kernel.code, + // &kernel.code, // kernel.global_labels["ripemd_alt"], // stack_init, // &kernel.prover_inputs // )?; // let result = stack_result.stack()[1]; // let actual = format!("{:X}", result); - // println!("{}", actual); + // println!("{}", actual); // assert_eq!(expected, actual); Ok(()) } - // use std::str::FromStr; // use anyhow::Result; diff --git a/evm/src/memory/segments.rs b/evm/src/memory/segments.rs index 5bfe0f99..5b3725d7 100644 --- a/evm/src/memory/segments.rs +++ b/evm/src/memory/segments.rs @@ -37,7 +37,7 @@ pub(crate) enum Segment { /// See also `StateTrieCheckpointPointer`. StorageTrieCheckpointPointers = 14, /// RipeMD storage - /// + /// RipeMd = 15, } @@ -83,7 +83,7 @@ impl Segment { Segment::StorageTrieAddresses => "SEGMENT_STORAGE_TRIE_ADDRS", Segment::StorageTriePointers => "SEGMENT_STORAGE_TRIE_PTRS", Segment::StorageTrieCheckpointPointers => "SEGMENT_STORAGE_TRIE_CHECKPOINT_PTRS", - Segment::RipeMd => "SEGMENT_RIPEMD" + Segment::RipeMd => "SEGMENT_RIPEMD", } }