Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/aleph-sdk/src/client.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ impl MemorySize for Bytes {
const BYTES_PER_UNIT: u64 = 1;
}

impl From<u64> 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<Self, MemConvError> {
Expand Down Expand Up @@ -154,6 +160,11 @@ macro_rules! mem_unit {
}
}
}
impl From<u64> for $name {
fn from(v: u64) -> Self {
Self(v)
}
}
};
}

Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/message/execution/environment.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/message/execution/volume.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/message/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/message/program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/aleph-types/src/message/store.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down