fix merge errors

cronos-labs · Jan 25, 2025 · a8a6465 · a8a6465
1 parent 2cab43e
commit a8a6465
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/core/lib/contract_verifier/src/lib.rs b/core/lib/contract_verifier/src/lib.rs
@@ -269,7 +269,6 @@ impl ContractVerifier {
                 "Deployed (runtime) bytecode mismatch",
             );
 
-            // try without the last 64bytes which usually represents the compiler metadata
             let mut deployed_bytecode_without_metadata: Vec<u8> = deployed_bytecode.to_vec();
             // Check if the length of the vector is greater than or equal to 64
             if deployed_bytecode_without_metadata.len() >= 64 {

diff --git a/core/lib/env_config/src/eth_sender.rs b/core/lib/env_config/src/eth_sender.rs
@@ -143,11 +143,8 @@ mod tests {
             ETH_WATCH_CONFIRMATIONS_FOR_ETH_EVENT="0"
             ETH_WATCH_ETH_NODE_POLL_INTERVAL="300"
             ETH_CLIENT_WEB3_URL="http://127.0.0.1:8545"
-<<<<<<< HEAD
             ETH_CLIENT_GATEWAY_WEB3_URL="http://127.0.0.1:8547"
-=======
             ETH_SENDER_SENDER_MAX_ACCEPTABLE_BASE_FEE_IN_WEI="100000000000"
->>>>>>> 63535ef4a (Problem: eth_sender transaction's base fee is not capped (#96))
 
         "#;
         lock.set_env(config);