Skip to content

Change constants to enumerations #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majecty merged 3 commits into from
Feb 4, 2020
Merged

Change constants to enumerations #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5903920
Change constants to enumerations
Jan 9, 2020
48b2c71
Merge branch 'master' into enum
Feb 3, 2020
f1d0d50
Merge branch 'master' into enum
Feb 3, 2020
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 state/src/item/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl CacheableItem for Account {
}
}

const PREFIX: u8 = super::ADDRESS_PREFIX;
const PREFIX: u8 = super::Prefix::Account as u8;

impl Encodable for Account {
fn rlp_append(&self, s: &mut RlpStream) {
Expand Down
2 changes: 1 addition & 1 deletion state/src/item/dummy_shard_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl ShardText {
}
}

const PREFIX: u8 = super::SHARD_TEXT_PREFIX;
const PREFIX: u8 = super::Prefix::ShardText as u8;

#[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct ShardTextAddress(H256);
Expand Down
2 changes: 1 addition & 1 deletion state/src/item/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl CacheableItem for Metadata {
}
}

const PREFIX: u8 = super::METADATA_PREFIX;
const PREFIX: u8 = super::Prefix::Metadata as u8;

const INITIAL_LEN: usize = 4;
const TERM_LEN: usize = INITIAL_LEN + 2;
Expand Down
14 changes: 9 additions & 5 deletions state/src/item/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ pub mod metadata;
pub mod regular_account;
pub mod shard;

const ADDRESS_PREFIX: u8 = b'C';
const SHARD_PREFIX: u8 = b'H';
const METADATA_PREFIX: u8 = b'M';
const REGULAR_ACCOUNT_PREFIX: u8 = b'R';
const SHARD_TEXT_PREFIX: u8 = b'X';
#[derive(Clone, Copy)]
#[repr(u8)]
enum Prefix {
Account = b'C',
Shard = b'H',
Metadata = b'M',
RegularAccount = b'R',
ShardText = b'X',
}
2 changes: 1 addition & 1 deletion state/src/item/regular_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl CacheableItem for RegularAccount {
}
}

const PREFIX: u8 = super::REGULAR_ACCOUNT_PREFIX;
const PREFIX: u8 = super::Prefix::RegularAccount as u8;

impl Encodable for RegularAccount {
fn rlp_append(&self, s: &mut RlpStream) {
Expand Down
2 changes: 1 addition & 1 deletion state/src/item/shard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl CacheableItem for Shard {
}
}

const PREFIX: u8 = super::SHARD_PREFIX;
const PREFIX: u8 = super::Prefix::Shard as u8;

impl Encodable for Shard {
fn rlp_append(&self, s: &mut RlpStream) {
Expand Down
76 changes: 46 additions & 30 deletions types/src/transaction/action.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,39 @@ use ckey::{recover, Address, NetworkId, Public, Signature};
use primitives::{Bytes, H256};
use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};

const PAY: u8 = 0x02;
const SET_REGULAR_KEY: u8 = 0x03;
const CREATE_SHARD: u8 = 0x04;
const SET_SHARD_OWNERS: u8 = 0x05;
const SET_SHARD_USERS: u8 = 0x06;
// Deprecated
//const STORE: u8 = 0x08;
// Deprecated
//const REMOVE: u8 = 0x09;
// Derepcated
//const COMPOSE_ASSET: u8 = 0x16;
// Derepcated
//const DECOMPOSE_ASSET: u8 = 0x17;
const SHARD_STORE: u8 = 0x19;
#[derive(Clone, Copy)]
#[repr(u8)]
enum ActionTag {
Pay = 0x02,
SetRegularKey = 0x03,
CreateShard = 0x04,
SetShardOwners = 0x05,
SetShardUsers = 0x06,
ShardStore = 0x19,
Custom = 0xFF,
}

impl Encodable for ActionTag {
fn rlp_append(&self, s: &mut RlpStream) {
(*self as u8).rlp_append(s)
}
}

const CUSTOM: u8 = 0xFF;
impl Decodable for ActionTag {
fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
let tag = rlp.as_val()?;
match tag {
0x02u8 => Ok(Self::Pay),
0x03 => Ok(Self::SetRegularKey),
0x04 => Ok(Self::CreateShard),
0x05 => Ok(Self::SetShardOwners),
0x06 => Ok(Self::SetShardUsers),
0x19 => Ok(Self::ShardStore),
0xFF => Ok(Self::Custom),
_ => Err(DecoderError::Custom("Unexpected action prefix")),
}
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Action {
Expand Down Expand Up @@ -158,30 +175,30 @@ impl Encodable for Action {
quantity,
} => {
s.begin_list(3);
s.append(&PAY);
s.append(&ActionTag::Pay);
s.append(receiver);
s.append(quantity);
}
Action::SetRegularKey {
key,
} => {
s.begin_list(2);
s.append(&SET_REGULAR_KEY);
s.append(&ActionTag::SetRegularKey);
s.append(key);
}
Action::CreateShard {
users,
} => {
s.begin_list(2);
s.append(&CREATE_SHARD);
s.append(&ActionTag::CreateShard);
s.append_list(users);
}
Action::SetShardOwners {
shard_id,
owners,
} => {
s.begin_list(3);
s.append(&SET_SHARD_OWNERS);
s.append(&ActionTag::SetShardOwners);
s.append(shard_id);
s.append_list(owners);
}
Expand All @@ -190,7 +207,7 @@ impl Encodable for Action {
users,
} => {
s.begin_list(3);
s.append(&SET_SHARD_USERS);
s.append(&ActionTag::SetShardUsers);
s.append(shard_id);
s.append_list(users);
}
Expand All @@ -199,7 +216,7 @@ impl Encodable for Action {
bytes,
} => {
s.begin_list(3);
s.append(&CUSTOM);
s.append(&ActionTag::Custom);
s.append(handler_id);
s.append(bytes);
}
Expand All @@ -209,7 +226,7 @@ impl Encodable for Action {
network_id,
} => {
s.begin_list(4);
s.append(&SHARD_STORE);
s.append(&ActionTag::ShardStore);
s.append(network_id);
s.append(shard_id);
s.append(content);
Expand All @@ -221,7 +238,7 @@ impl Encodable for Action {
impl Decodable for Action {
fn decode(rlp: &Rlp<'_>) -> Result<Self, DecoderError> {
match rlp.val_at(0)? {
PAY => {
ActionTag::Pay => {
let item_count = rlp.item_count()?;
if item_count != 3 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -234,7 +251,7 @@ impl Decodable for Action {
quantity: rlp.val_at(2)?,
})
}
SET_REGULAR_KEY => {
ActionTag::SetRegularKey => {
let item_count = rlp.item_count()?;
if item_count != 2 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -246,7 +263,7 @@ impl Decodable for Action {
key: rlp.val_at(1)?,
})
}
CREATE_SHARD => {
ActionTag::CreateShard => {
let item_count = rlp.item_count()?;
if item_count != 2 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -258,7 +275,7 @@ impl Decodable for Action {
users: rlp.list_at(1)?,
})
}
SET_SHARD_OWNERS => {
ActionTag::SetShardOwners => {
let item_count = rlp.item_count()?;
if item_count != 3 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -271,7 +288,7 @@ impl Decodable for Action {
owners: rlp.list_at(2)?,
})
}
SET_SHARD_USERS => {
ActionTag::SetShardUsers => {
let item_count = rlp.item_count()?;
if item_count != 3 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -284,7 +301,7 @@ impl Decodable for Action {
users: rlp.list_at(2)?,
})
}
CUSTOM => {
ActionTag::Custom => {
let item_count = rlp.item_count()?;
if item_count != 3 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -297,7 +314,7 @@ impl Decodable for Action {
bytes: rlp.val_at(2)?,
})
}
SHARD_STORE => {
ActionTag::ShardStore => {
let item_count = rlp.item_count()?;
if item_count != 4 {
return Err(DecoderError::RlpIncorrectListLen {
Expand All @@ -311,7 +328,6 @@ impl Decodable for Action {
content: rlp.val_at(3)?,
})
}
_ => Err(DecoderError::Custom("Unexpected action prefix")),
}
}
}
Expand Down