resolve comments

core/src/buffer.rs

@@ -29,15 +29,13 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// Limited len vector.
 /// `T` is data type.
 /// `E` is overflow error type.
 /// `N` is max len which a vector can have.
 #[derive(Clone, Default, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct LimitedVec<T, E, const N: usize>(Vec<T>, PhantomData<E>);
 
 /// Formatter for [`LimitedVec`] will print to precision of 8 by default, to print the whole data, use `{:+}`.

core/src/memory.rs

@@ -38,8 +38,6 @@ use scale_info::{
  scale::{self, Decode, Encode, EncodeLike, Input, Output},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// Interval in wasm program memory.
 #[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
@@ -113,7 +111,6 @@ pub type PageBufInner = LimitedVec<u8, IntoPageBufError, { GearPage::SIZE as usi
 
 /// Buffer for gear page data.
 #[derive(Clone, PartialEq, Eq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize))]
 pub struct PageBuf(PageBufInner);
 
 // These traits are implemented intentionally by hand to achieve two goals:

core/src/message/common.rs

@@ -29,8 +29,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// An entity that is used for interaction between actors.
 /// Can transfer value and executes by programs in corresponding function: init, handle or handle_reply.
@@ -181,7 +179,7 @@ impl Message {
  TypeInfo,
  derive_more::From,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub enum MessageDetails {
  /// Reply details.
  Reply(ReplyDetails),
@@ -231,7 +229,7 @@ impl MessageDetails {
 #[derive(
  Clone, Copy, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct ReplyDetails {
  /// Message id, this message replies on.
  to: MessageId,
@@ -265,7 +263,7 @@ impl ReplyDetails {
 #[derive(
  Clone, Copy, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct SignalDetails {
  /// Message id, which issues signal.
  to: MessageId,

core/src/message/context.rs

@@ -33,8 +33,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 use super::{DispatchKind, IncomingDispatch, Packet};
 
@@ -146,7 +144,7 @@ impl ContextOutcome {
 
 /// Store of previous message execution context.
 #[derive(Clone, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct ContextStore {
  outgoing: BTreeMap<u32, Option<Payload>>,
  reply: Option<Payload>,

core/src/message/mod.rs

@@ -49,8 +49,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// Max payload size which one message can have (8 MiB).
 pub const MAX_PAYLOAD_SIZE: usize = 8 * 1024 * 1024;
@@ -62,7 +60,7 @@ const _: () = assert!(MAX_PAYLOAD_SIZE <= u32::MAX as usize);
 #[derive(
  Clone, Copy, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct PayloadSizeError;
 
 impl From<PayloadSizeError> for &str {
@@ -116,7 +114,7 @@ pub enum MessageWaitedType {
 #[derive(
  Copy, Clone, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub enum DispatchKind {
  /// Initialization.
  Init,

core/src/pages.rs

@@ -26,8 +26,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 pub use numerated::{self, num_traits};
 
@@ -197,7 +195,7 @@ impl<const SIZE: u32> PartialOrd<PagesAmount<SIZE>> for Page<SIZE> {
  Default,
  derive_more::Into,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct Page<const SIZE: u32>(u32);
 
 impl<const SIZE: u32> Page<SIZE> {

core/src/program.rs

@@ -30,8 +30,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// Program in different states in storage.
 #[derive(Clone, Debug, Decode, Encode, PartialEq, Eq, TypeInfo)]
@@ -126,7 +124,7 @@ pub enum ProgramState {
 
 /// Struct defines infix of memory pages storage.
 #[derive(Clone, Copy, Debug, Default, Decode, Encode, PartialEq, Eq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct MemoryInfix(u32);
 
 impl MemoryInfix {

core/src/reservation.rs

@@ -28,8 +28,6 @@ use scale_info::{
  scale::{Decode, Encode},
  TypeInfo,
 };
-#[cfg(feature = "std")]
-use serde::Serialize;
 
 /// An unchangeable wrapper over u64 value, which is required
 /// to be used as a "view-only" reservations nonce in a message
@@ -42,7 +40,7 @@ use serde::Serialize;
 #[derive(
  Clone, Copy, Default, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode, TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize))]
 pub struct ReservationNonce(u64);
 
 impl From<&InnerNonce> for ReservationNonce {

ethexe/rpc/src/modules/block.rs → ethexe/rpc/src/apis/block.rs

@@ -1,28 +1,30 @@
-use std::collections::VecDeque;
+// This file is part of Gear.
+//
+// Copyright (C) 2024 Gear Technologies Inc.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::{common::block_header_at_or_latest, errors};
 use ethexe_common::BlockRequestEvent;
 use ethexe_db::{BlockHeader, BlockMetaStorage, Database};
 use gprimitives::H256;
 use jsonrpsee::{
  core::{async_trait, RpcResult},
  proc_macros::rpc,
 };
-
-use crate::errors;
-
-pub fn block_header_at_or_latest(
- db: &Database,
- at: impl Into<Option<H256>>,
-) -> RpcResult<(H256, BlockHeader)> {
- if let Some(hash) = at.into() {
- db.block_header(hash)
- .map(|header| (hash, header))
- .ok_or_else(|| errors::db_err("Block header for requested hash wasn't found"))
- } else {
- db.latest_valid_block()
- .ok_or_else(|| errors::db_err("Latest block header wasn't found"))
- }
-}
+use std::collections::VecDeque;
 
 #[rpc(server)]
 pub trait Block {
@@ -37,18 +39,18 @@ pub trait Block {
 }
 
 #[derive(Clone)]
-pub struct BlockApiModule {
+pub struct BlockApi {
  db: Database,
 }
 
-impl BlockApiModule {
+impl BlockApi {
  pub fn new(db: Database) -> Self {
  Self { db }
  }
 }
 
 #[async_trait]
-impl BlockServer for BlockApiModule {
+impl BlockServer for BlockApi {
  async fn block_header(&self, hash: Option<H256>) -> RpcResult<(H256, BlockHeader)> {
  block_header_at_or_latest(&self.db, hash)
  }
@@ -58,14 +60,14 @@ impl BlockServer for BlockApiModule {
 
  self.db
  .block_commitment_queue(block_hash)
- .ok_or_else(|| errors::db_err("Block commitment queue wasn't found"))
+ .ok_or_else(|| errors::db("Block commitment queue wasn't found"))
  }
 
  async fn block_events(&self, hash: Option<H256>) -> RpcResult<Vec<BlockRequestEvent>> {
  let block_hash = block_header_at_or_latest(&self.db, hash)?.0;
 
  self.db
  .block_events(block_hash)
- .ok_or_else(|| errors::db_err("Block events weren't found"))
+ .ok_or_else(|| errors::db("Block events weren't found"))
  }
 }

ethexe/rpc/src/apis/mod.rs

@@ -0,0 +1,23 @@
+// This file is part of Gear.
+//
+// Copyright (C) 2024 Gear Technologies Inc.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+mod block;
+mod program;
+
+pub use block::{BlockApi, BlockServer};
+pub use program::{ProgramApi, ProgramServer};