diff --git a/crates/aleph-sdk/src/client.rs b/crates/aleph-sdk/src/client.rs index 7b3dcd4..d9fc877 100644 --- a/crates/aleph-sdk/src/client.rs +++ b/crates/aleph-sdk/src/client.rs @@ -1,8 +1,8 @@ use aleph_types::chain::{Address, Chain, Signature}; use aleph_types::channel::Channel; use aleph_types::item_hash::ItemHash; +use aleph_types::memory_size::{Bytes, MemorySize}; use aleph_types::message::{ContentSource, Message, MessageStatus, MessageType}; -use aleph_types::storage_size::{Bytes, MemorySize}; use aleph_types::timestamp::Timestamp; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; diff --git a/crates/aleph-types/src/lib.rs b/crates/aleph-types/src/lib.rs index 832b02f..fd96c3f 100644 --- a/crates/aleph-types/src/lib.rs +++ b/crates/aleph-types/src/lib.rs @@ -2,7 +2,7 @@ pub mod chain; pub mod channel; pub mod cid; pub mod item_hash; +pub mod memory_size; pub mod message; -pub mod storage_size; pub mod timestamp; pub(crate) mod toolkit; diff --git a/crates/aleph-types/src/storage_size.rs b/crates/aleph-types/src/memory_size.rs similarity index 97% rename from crates/aleph-types/src/storage_size.rs rename to crates/aleph-types/src/memory_size.rs index 7644f3c..a220dd1 100644 --- a/crates/aleph-types/src/storage_size.rs +++ b/crates/aleph-types/src/memory_size.rs @@ -113,6 +113,12 @@ impl MemorySize for Bytes { const BYTES_PER_UNIT: u64 = 1; } +impl From for Bytes { + fn from(value: u64) -> Self { + Self(value) + } +} + impl Bytes { /// Additional constructor that can catch domain rules if you ever add them. fn from_units_checked(units: u64) -> Result { @@ -154,6 +160,11 @@ macro_rules! mem_unit { } } } + impl From for $name { + fn from(v: u64) -> Self { + Self(v) + } + } }; } diff --git a/crates/aleph-types/src/message/execution/environment.rs b/crates/aleph-types/src/message/execution/environment.rs index 4d63c9e..8c528fc 100644 --- a/crates/aleph-types/src/message/execution/environment.rs +++ b/crates/aleph-types/src/message/execution/environment.rs @@ -1,6 +1,6 @@ use crate::chain::Address; use crate::item_hash::ItemHash; -use crate::storage_size::{MemorySize, MiB}; +use crate::memory_size::{MemorySize, MiB}; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] diff --git a/crates/aleph-types/src/message/execution/volume.rs b/crates/aleph-types/src/message/execution/volume.rs index bc7cdc2..ec06701 100644 --- a/crates/aleph-types/src/message/execution/volume.rs +++ b/crates/aleph-types/src/message/execution/volume.rs @@ -1,5 +1,5 @@ use crate::item_hash::ItemHash; -use crate::storage_size::{MemorySize, MiB, gigabyte_to_mebibyte}; +use crate::memory_size::{MemorySize, MiB, gigabyte_to_mebibyte}; use crate::toolkit::serde::default_true; use serde::{Deserialize, Serialize}; use std::path::PathBuf; diff --git a/crates/aleph-types/src/message/instance.rs b/crates/aleph-types/src/message/instance.rs index f8189ec..2467191 100644 --- a/crates/aleph-types/src/message/instance.rs +++ b/crates/aleph-types/src/message/instance.rs @@ -17,6 +17,7 @@ pub struct InstanceContent { mod test { use super::*; use crate::chain::Chain; + use crate::memory_size::{MemorySize, MiB}; use crate::message::base_message::{MessageConfirmation, MessageContentEnum}; use crate::message::execution::base::{Payment, PaymentType}; use crate::message::execution::environment::{ @@ -25,7 +26,6 @@ mod test { }; use crate::message::execution::volume::{ParentVolume, VolumePersistence}; use crate::message::{ContentSource, Message, MessageType}; - use crate::storage_size::{MemorySize, MiB}; use crate::timestamp::Timestamp; use crate::{address, channel, item_hash, signature}; use assert_matches::assert_matches; diff --git a/crates/aleph-types/src/message/program.rs b/crates/aleph-types/src/message/program.rs index cd2b253..02dedac 100644 --- a/crates/aleph-types/src/message/program.rs +++ b/crates/aleph-types/src/message/program.rs @@ -75,11 +75,11 @@ impl ProgramContent { mod tests { use super::*; use crate::chain::{Address, Chain, Signature}; + use crate::memory_size::{MemorySize, MiB}; use crate::message::base_message::MessageContentEnum; use crate::message::execution::environment::MachineResources; use crate::message::execution::volume::{BaseVolume, ImmutableVolume, MachineVolume}; use crate::message::{ContentSource, Message, MessageType}; - use crate::storage_size::{MemorySize, MiB}; use crate::timestamp::Timestamp; use crate::{channel, item_hash}; use assert_matches::assert_matches; diff --git a/crates/aleph-types/src/message/store.rs b/crates/aleph-types/src/message/store.rs index 2d2e095..7299696 100644 --- a/crates/aleph-types/src/message/store.rs +++ b/crates/aleph-types/src/message/store.rs @@ -1,6 +1,6 @@ use crate::cid::Cid; use crate::item_hash::{AlephItemHash, ItemHash}; -use crate::storage_size::Bytes; +use crate::memory_size::Bytes; use serde::{Deserialize, Serialize}; use std::collections::HashMap;