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
3 changes: 1 addition & 2 deletions dash-spv/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ pub use dashcore::{Address, BlockHash, Network, OutPoint, ScriptBuf};

// Re-export MasternodeListEngine and related types
pub use dashcore::sml::masternode_list_engine::{
MasternodeListEngine,
MasternodeListEngine, MasternodeListEngineBTreeMapBlockContainer,
MasternodeListEngineBlockContainer,
MasternodeListEngineBTreeMapBlockContainer,
};

/// Current version of the dash-spv library.
Expand Down
6 changes: 1 addition & 5 deletions dash/src/blockdata/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ fn dash_genesis_tx() -> Transaction {
ret
}


/// Constructs and returns the genesis block.
pub fn genesis_block(network: Network) -> Block {
let txdata = vec![dash_genesis_tx()];
Expand Down Expand Up @@ -268,10 +267,7 @@ mod test {

// The wtxid should be deterministic for the coinbase transaction
let wtxid_str = genesis_tx.wtxid().to_string();
assert_eq!(
wtxid_str,
"babeaa0bf3af03c0f12d94da95c7f28168be22087a16fb207e7abda4ae654ee3"
);
assert_eq!(wtxid_str, "babeaa0bf3af03c0f12d94da95c7f28168be22087a16fb207e7abda4ae654ee3");
}

#[test]
Expand Down
16 changes: 8 additions & 8 deletions dash/src/network/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -964,34 +964,34 @@ mod test {
magic: crate::Network::Dash.magic(),
payload: msg_true,
};

// Encode
let encoded = serialize(&raw_msg);

// Decode
let decoded: RawNetworkMessage = deserialize(&encoded).unwrap();

// Verify
match decoded.payload {
NetworkMessage::SendDsq(wants_dsq) => {
assert_eq!(wants_dsq, true);
}
_ => panic!("Expected SendDsq message"),
}

// Test encoding and decoding SendDsq(false)
let msg_false = NetworkMessage::SendDsq(false);
let raw_msg = RawNetworkMessage {
magic: crate::Network::Dash.magic(),
payload: msg_false,
};

// Encode
let encoded = serialize(&raw_msg);

// Decode
let decoded: RawNetworkMessage = deserialize(&encoded).unwrap();

// Verify
match decoded.payload {
NetworkMessage::SendDsq(wants_dsq) => {
Expand All @@ -1000,7 +1000,7 @@ mod test {
_ => panic!("Expected SendDsq message"),
}
}

#[test]
fn test_senddsq_command_string() {
let msg = NetworkMessage::SendDsq(true);
Expand Down
Loading