fix review

Author: yoshidan

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Datachain, Inc
+   Copyright 2025 Datachain, Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

server/src/host/single/handler.rs

@@ -43,11 +43,11 @@ impl DerivationRequest {
     }
 
     async fn run_client_native(
-        hint_reader: HintWriter<NativeChannel>,
+        hint_writer: HintWriter<NativeChannel>,
         oracle_reader: OracleReader<NativeChannel>,
         evm_factory: FpvmOpEvmFactory<NativeChannel>,
     ) -> Result<()> {
-        kona_client::single::run(oracle_reader, hint_reader, evm_factory)
+        kona_client::single::run(oracle_reader, hint_writer, evm_factory)
             .await
             .map_err(Into::into)
     }

server/src/host/single/trace.rs

@@ -36,8 +36,8 @@ impl KeyValueStore for TracingKeyValueStore {
 
 pub fn encode_to_bytes(used: hashbrown::HashMap<PreimageKey, Vec<u8>>) -> Preimages {
     let mut temp: Vec<Preimage> = Vec::with_capacity(used.len());
-    for (k, v) in used.iter() {
-        temp.push(Preimage::new(*k, v.clone()));
+    for (k, v) in used.into_iter() {
+        temp.push(Preimage::new(k, v));
     }
 
     Preimages { preimages: temp }

server/src/main.rs

@@ -1,6 +1,3 @@
-#![feature(const_trait_impl)]
-extern crate core;
-
 use crate::host::single::config::Config;
 use crate::server::{start_http_server_task, DerivationState};
 use clap::Parser;

server/src/server.rs

@@ -7,12 +7,12 @@ use axum::http::StatusCode;
 use axum::routing::post;
 use axum::Json;
 use kona_genesis::RollupConfig;
-use log::{error, info};
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 use std::sync::Arc;
 use tokio::net::TcpListener;
 use tokio::task::JoinHandle;
+use tracing::{error, info};
 
 pub struct DerivationState {
     pub rollup_config: RollupConfig,
@@ -56,25 +56,8 @@ async fn derivation(
     Json(payload): Json<Request>,
 ) -> (StatusCode, Vec<u8>) {
     info!("derivation request: {:?}", payload);
-    if payload.agreed_l2_output_root == payload.l2_output_root {
-        error!("agreed_l2_output_root and l2_output_root are same value");
-        return (StatusCode::BAD_REQUEST, vec![]);
-    }
-    if payload.agreed_l2_output_root.is_empty() || payload.agreed_l2_output_root.is_zero() {
-        error!("invalid agreed_l2_output_root",);
-        return (StatusCode::BAD_REQUEST, vec![]);
-    }
-    if payload.l2_output_root.is_empty() || payload.l2_output_root.is_zero() {
-        error!("invalid l2_output_root",);
-        return (StatusCode::BAD_REQUEST, vec![]);
-    }
-    if payload.l1_head_hash.is_empty() || payload.l1_head_hash.is_zero() {
-        error!("invalid l1_head_hash",);
-        return (StatusCode::BAD_REQUEST, vec![]);
-    }
-    if payload.l2_block_number == 0 {
-        error!("invalid l2_block_number",);
-        return (StatusCode::BAD_REQUEST, vec![]);
+    if let Err(v) = validate_request(&payload) {
+        return (StatusCode::BAD_REQUEST, v.as_bytes().to_vec());
     }
 
     let derivation = DerivationRequest {
@@ -99,3 +82,27 @@ async fn derivation(
         }
     }
 }
+
+fn validate_request(payload: &Request) -> Result<(), &'static str> {
+    if payload.agreed_l2_output_root == payload.l2_output_root {
+        error!("agreed_l2_output_root and l2_output_root are same value");
+        return Err("agreed_l2_output_root and l2_output_root are the same value");
+    }
+    if payload.agreed_l2_output_root.is_empty() || payload.agreed_l2_output_root.is_zero() {
+        error!("invalid agreed_l2_output_root",);
+        return Err("invalid agreed_l2_output_root");
+    }
+    if payload.l2_output_root.is_empty() || payload.l2_output_root.is_zero() {
+        error!("invalid l2_output_root",);
+        return Err("invalid l2_output_root");
+    }
+    if payload.l1_head_hash.is_empty() || payload.l1_head_hash.is_zero() {
+        error!("invalid l1_head_hash",);
+        return Err("invalid l1_head_hash");
+    }
+    if payload.l2_block_number == 0 {
+        error!("invalid l2_block_number",);
+        return Err("invalid l2_block_number");
+    }
+    Ok(())
+}