diff --git a/node_core/src/sequencer_client/mod.rs b/node_core/src/sequencer_client/mod.rs index 6a65b9e..4282ecd 100644 --- a/node_core/src/sequencer_client/mod.rs +++ b/node_core/src/sequencer_client/mod.rs @@ -1,8 +1,11 @@ use accounts::account_core::Account; use anyhow::Result; -use json::{ +use rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse, - RegisterAccountRequest, RegisterAccountResponse, SendTxRequest, SendTxResponse, + RegisterAccountRequest, RegisterAccountResponse, +}; +use json::{ + SendTxResponse, SendTxRequest, SequencerRpcError, SequencerRpcRequest, SequencerRpcResponse, }; use k256::elliptic_curve::group::GroupEncoding; diff --git a/node_rpc/src/process.rs b/node_rpc/src/process.rs index 38b5843..1bd367d 100644 --- a/node_rpc/src/process.rs +++ b/node_rpc/src/process.rs @@ -11,11 +11,12 @@ use rpc_primitives::{ }; use storage::transaction::ActionData; +use rpc_primitives::requests::{GetLastBlockRequest, GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, GetBlockDataRequest, GetBlockDataResponse}; + use crate::types::rpc_structs::{ ExecuteScenarioMultipleSendRequest, ExecuteScenarioMultipleSendResponse, ExecuteScenarioSplitRequest, ExecuteScenarioSplitResponse, ExecuteSubscenarioRequest, - ExecuteSubscenarioResponse, GetBlockDataRequest, GetBlockDataResponse, GetLastBlockRequest, - GetLastBlockResponse, RegisterAccountRequest, RegisterAccountResponse, + ExecuteSubscenarioResponse, ShowAccountPublicBalanceRequest, ShowAccountPublicBalanceResponse, ShowAccountUTXORequest, ShowAccountUTXOResponse, ShowTransactionRequest, ShowTransactionResponse, UTXOShortEssentialStruct, WriteDepositPublicBalanceRequest, WriteDepositPublicBalanceResponse, diff --git a/rpc_primitives/src/lib.rs b/rpc_primitives/src/lib.rs index 5e3d870..ffa8564 100644 --- a/rpc_primitives/src/lib.rs +++ b/rpc_primitives/src/lib.rs @@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize}; pub mod errors; pub mod message; pub mod parser; +pub mod requests; #[derive(Serialize, Deserialize, Clone, Copy, Debug)] pub struct RpcPollingConfig { diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index 294878e..b89960c 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -8,7 +8,7 @@ use rpc_primitives::{ parser::RpcRequest, }; -use crate::types::rpc_structs::{ +use rpc_primitives::requests::{ GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse, GetLastBlockRequest, GetLastBlockResponse, HelloRequest, HelloResponse, RegisterAccountRequest, RegisterAccountResponse, SendTxRequest, SendTxResponse,