Merge pull request #24 from ethcore/pub_message_fields

All fields of bitcoin messages -> public
This commit is contained in:
Marek Kotewicz 2016-10-21 15:13:01 +02:00 committed by GitHub
commit 3d29057e42
17 changed files with 42 additions and 42 deletions

View File

@ -7,12 +7,12 @@ use hash::H256;
#[derive(PartialEq)]
pub struct BlockHeader {
version: u32,
previous_header_hash: H256,
merkle_root_hash: H256,
time: u32,
nbits: u32,
nonce: u32,
pub version: u32,
pub previous_header_hash: H256,
pub merkle_root_hash: H256,
pub time: u32,
pub nbits: u32,
pub nonce: u32,
}
impl fmt::Debug for BlockHeader {

View File

@ -4,10 +4,10 @@ use common::PrefilledTransaction;
#[derive(Debug, PartialEq)]
pub struct BlockHeaderAndIDs {
header: BlockHeader,
nonce: u64,
short_ids: Vec<ShortTransactionID>,
prefilled_transactions: Vec<PrefilledTransaction>,
pub header: BlockHeader,
pub nonce: u64,
pub short_ids: Vec<ShortTransactionID>,
pub prefilled_transactions: Vec<PrefilledTransaction>,
}
impl Serializable for BlockHeaderAndIDs {

View File

@ -4,8 +4,8 @@ use chain::Transaction;
#[derive(Debug, PartialEq)]
pub struct BlockTransactions {
blockhash: H256,
transactions: Vec<Transaction>,
pub blockhash: H256,
pub transactions: Vec<Transaction>,
}
impl Serializable for BlockTransactions {

View File

@ -6,8 +6,8 @@ use ser::{
#[derive(Debug, PartialEq)]
pub struct BlockTransactionsRequest {
blockhash: H256,
indexes: Vec<usize>,
pub blockhash: H256,
pub indexes: Vec<usize>,
}
impl Serializable for BlockTransactionsRequest {

View File

@ -6,8 +6,8 @@ use chain::Transaction;
#[derive(Debug, PartialEq)]
pub struct PrefilledTransaction {
index: usize,
transaction: Transaction,
pub index: usize,
pub transaction: Transaction,
}
impl Serializable for PrefilledTransaction {

View File

@ -4,7 +4,7 @@ use {MessageResult, Payload};
#[derive(Debug, PartialEq)]
pub struct BlockTxn {
request: BlockTransactions,
pub request: BlockTransactions,
}
impl Payload for BlockTxn {

View File

@ -4,7 +4,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct CompactBlock {
header: BlockHeaderAndIDs,
pub header: BlockHeaderAndIDs,
}
impl Payload for CompactBlock {

View File

@ -3,7 +3,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct FeeFilter {
fee_rate: u64,
pub fee_rate: u64,
}
impl Payload for FeeFilter {

View File

@ -5,7 +5,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct FilterAdd {
// TODO: check how this should be serialized
data: Bytes,
pub data: Bytes,
}
impl Payload for FilterAdd {

View File

@ -5,10 +5,10 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct FilterLoad {
// TODO: check how this should be serialized
filter: Bytes,
hash_functions: u32,
tweak: u32,
flags: u8,
pub filter: Bytes,
pub hash_functions: u32,
pub tweak: u32,
pub flags: u8,
}
impl Payload for FilterLoad {

View File

@ -4,9 +4,9 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct GetBlocks {
version: u32,
block_locator_hashes: Vec<H256>,
hash_stop: H256,
pub version: u32,
pub block_locator_hashes: Vec<H256>,
pub hash_stop: H256,
}
impl Payload for GetBlocks {

View File

@ -4,7 +4,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct GetBlockTxn {
request: BlockTransactionsRequest,
pub request: BlockTransactionsRequest,
}
impl Payload for GetBlockTxn {

View File

@ -4,9 +4,9 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct GetHeaders {
version: u32,
block_locator_hashes: Vec<H256>,
hash_stop: H256,
pub version: u32,
pub block_locator_hashes: Vec<H256>,
pub hash_stop: H256,
}
impl Payload for GetHeaders {

View File

@ -5,7 +5,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct Headers {
// TODO: Block headers need to have txn_count field
headers: Vec<BlockHeader>,
pub headers: Vec<BlockHeader>,
}
impl Payload for Headers {

View File

@ -6,10 +6,10 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct MerkleBlock {
block_header: BlockHeader,
total_transactions: u32,
hashes: Vec<H256>,
flags: Bytes,
pub block_header: BlockHeader,
pub total_transactions: u32,
pub hashes: Vec<H256>,
pub flags: Bytes,
}
impl Payload for MerkleBlock {

View File

@ -3,7 +3,7 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq, Clone, Copy)]
#[repr(u8)]
enum RejectCode {
pub enum RejectCode {
Malformed = 0x01,
Invalid = 0x10,
Obsolate = 0x11,
@ -53,9 +53,9 @@ impl Deserializable for RejectCode {
#[derive(Debug, PartialEq)]
pub struct Reject {
message: String,
code: RejectCode,
reason: String,
pub message: String,
pub code: RejectCode,
pub reason: String,
// TODO: data
}

View File

@ -3,8 +3,8 @@ use {Payload, MessageResult};
#[derive(Debug, PartialEq)]
pub struct SendCompact {
first: bool,
second: u64,
pub first: bool,
pub second: u64,
}
impl Payload for SendCompact {