From 49628a3d2cfd516f37cc79b7192ef3ea8d50921a Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 21 Oct 2016 16:08:46 +0300 Subject: [PATCH] all fields of bitcoin messages -> public --- chain/src/block_header.rs | 12 ++++++------ message/src/common/block_header_and_ids.rs | 8 ++++---- message/src/common/block_transactions.rs | 4 ++-- message/src/common/block_transactions_request.rs | 4 ++-- message/src/common/prefilled_transaction.rs | 4 ++-- message/src/types/blocktxn.rs | 2 +- message/src/types/compactblock.rs | 2 +- message/src/types/feefilter.rs | 2 +- message/src/types/filteradd.rs | 2 +- message/src/types/filterload.rs | 8 ++++---- message/src/types/getblocks.rs | 6 +++--- message/src/types/getblocktxn.rs | 2 +- message/src/types/getheaders.rs | 6 +++--- message/src/types/headers.rs | 2 +- message/src/types/merkle_block.rs | 8 ++++---- message/src/types/reject.rs | 8 ++++---- message/src/types/sendcompact.rs | 4 ++-- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/chain/src/block_header.rs b/chain/src/block_header.rs index ae18baec..d368b07d 100644 --- a/chain/src/block_header.rs +++ b/chain/src/block_header.rs @@ -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 { diff --git a/message/src/common/block_header_and_ids.rs b/message/src/common/block_header_and_ids.rs index 956fb193..42543e77 100644 --- a/message/src/common/block_header_and_ids.rs +++ b/message/src/common/block_header_and_ids.rs @@ -4,10 +4,10 @@ use common::PrefilledTransaction; #[derive(Debug, PartialEq)] pub struct BlockHeaderAndIDs { - header: BlockHeader, - nonce: u64, - short_ids: Vec, - prefilled_transactions: Vec, + pub header: BlockHeader, + pub nonce: u64, + pub short_ids: Vec, + pub prefilled_transactions: Vec, } impl Serializable for BlockHeaderAndIDs { diff --git a/message/src/common/block_transactions.rs b/message/src/common/block_transactions.rs index 247b7d3e..5e09d6b5 100644 --- a/message/src/common/block_transactions.rs +++ b/message/src/common/block_transactions.rs @@ -4,8 +4,8 @@ use chain::Transaction; #[derive(Debug, PartialEq)] pub struct BlockTransactions { - blockhash: H256, - transactions: Vec, + pub blockhash: H256, + pub transactions: Vec, } impl Serializable for BlockTransactions { diff --git a/message/src/common/block_transactions_request.rs b/message/src/common/block_transactions_request.rs index d6e75127..ce6542c9 100644 --- a/message/src/common/block_transactions_request.rs +++ b/message/src/common/block_transactions_request.rs @@ -6,8 +6,8 @@ use ser::{ #[derive(Debug, PartialEq)] pub struct BlockTransactionsRequest { - blockhash: H256, - indexes: Vec, + pub blockhash: H256, + pub indexes: Vec, } impl Serializable for BlockTransactionsRequest { diff --git a/message/src/common/prefilled_transaction.rs b/message/src/common/prefilled_transaction.rs index bbeb0be0..51df4196 100644 --- a/message/src/common/prefilled_transaction.rs +++ b/message/src/common/prefilled_transaction.rs @@ -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 { diff --git a/message/src/types/blocktxn.rs b/message/src/types/blocktxn.rs index ed1cd0ce..f7f6c8d5 100644 --- a/message/src/types/blocktxn.rs +++ b/message/src/types/blocktxn.rs @@ -4,7 +4,7 @@ use {MessageResult, Payload}; #[derive(Debug, PartialEq)] pub struct BlockTxn { - request: BlockTransactions, + pub request: BlockTransactions, } impl Payload for BlockTxn { diff --git a/message/src/types/compactblock.rs b/message/src/types/compactblock.rs index 5b0cb217..5330352c 100644 --- a/message/src/types/compactblock.rs +++ b/message/src/types/compactblock.rs @@ -4,7 +4,7 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct CompactBlock { - header: BlockHeaderAndIDs, + pub header: BlockHeaderAndIDs, } impl Payload for CompactBlock { diff --git a/message/src/types/feefilter.rs b/message/src/types/feefilter.rs index e350959c..c9884f43 100644 --- a/message/src/types/feefilter.rs +++ b/message/src/types/feefilter.rs @@ -3,7 +3,7 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct FeeFilter { - fee_rate: u64, + pub fee_rate: u64, } impl Payload for FeeFilter { diff --git a/message/src/types/filteradd.rs b/message/src/types/filteradd.rs index 076a7e78..85ea4631 100644 --- a/message/src/types/filteradd.rs +++ b/message/src/types/filteradd.rs @@ -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 { diff --git a/message/src/types/filterload.rs b/message/src/types/filterload.rs index b12da440..d2dbba38 100644 --- a/message/src/types/filterload.rs +++ b/message/src/types/filterload.rs @@ -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 { diff --git a/message/src/types/getblocks.rs b/message/src/types/getblocks.rs index 7c0a87a8..9f7e2612 100644 --- a/message/src/types/getblocks.rs +++ b/message/src/types/getblocks.rs @@ -4,9 +4,9 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct GetBlocks { - version: u32, - block_locator_hashes: Vec, - hash_stop: H256, + pub version: u32, + pub block_locator_hashes: Vec, + pub hash_stop: H256, } impl Payload for GetBlocks { diff --git a/message/src/types/getblocktxn.rs b/message/src/types/getblocktxn.rs index 4168a4d1..78572d8d 100644 --- a/message/src/types/getblocktxn.rs +++ b/message/src/types/getblocktxn.rs @@ -4,7 +4,7 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct GetBlockTxn { - request: BlockTransactionsRequest, + pub request: BlockTransactionsRequest, } impl Payload for GetBlockTxn { diff --git a/message/src/types/getheaders.rs b/message/src/types/getheaders.rs index 9444f710..fd70d063 100644 --- a/message/src/types/getheaders.rs +++ b/message/src/types/getheaders.rs @@ -4,9 +4,9 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct GetHeaders { - version: u32, - block_locator_hashes: Vec, - hash_stop: H256, + pub version: u32, + pub block_locator_hashes: Vec, + pub hash_stop: H256, } impl Payload for GetHeaders { diff --git a/message/src/types/headers.rs b/message/src/types/headers.rs index c2241d9e..cee10d22 100644 --- a/message/src/types/headers.rs +++ b/message/src/types/headers.rs @@ -5,7 +5,7 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct Headers { // TODO: Block headers need to have txn_count field - headers: Vec, + pub headers: Vec, } impl Payload for Headers { diff --git a/message/src/types/merkle_block.rs b/message/src/types/merkle_block.rs index 790db5c4..fe9ccf62 100644 --- a/message/src/types/merkle_block.rs +++ b/message/src/types/merkle_block.rs @@ -6,10 +6,10 @@ use {Payload, MessageResult}; #[derive(Debug, PartialEq)] pub struct MerkleBlock { - block_header: BlockHeader, - total_transactions: u32, - hashes: Vec, - flags: Bytes, + pub block_header: BlockHeader, + pub total_transactions: u32, + pub hashes: Vec, + pub flags: Bytes, } impl Payload for MerkleBlock { diff --git a/message/src/types/reject.rs b/message/src/types/reject.rs index 33edf358..263d357e 100644 --- a/message/src/types/reject.rs +++ b/message/src/types/reject.rs @@ -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 } diff --git a/message/src/types/sendcompact.rs b/message/src/types/sendcompact.rs index b7c57bb3..0100beff 100644 --- a/message/src/types/sendcompact.rs +++ b/message/src/types/sendcompact.rs @@ -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 {