Skip to content
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

test: fix integration test for backport #1169 #1193

Merged
merged 1 commit into from
Jul 8, 2019
Merged

test: fix integration test for backport #1169 #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions test/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ fn main() {
specs.insert("sync_timeout", Box::new(SyncTimeout));
specs.insert("chain_fork_1", Box::new(ChainFork1));
specs.insert("chain_fork_2", Box::new(ChainFork2));
specs.insert("chain_fork_3", Box::new(ChainFork3));
specs.insert("chain_fork_4", Box::new(ChainFork4));
specs.insert("chain_fork_5", Box::new(ChainFork5));
specs.insert("chain_fork_6", Box::new(ChainFork6));
specs.insert("chain_fork_7", Box::new(ChainFork7));
// FIXME these 4 tests will fail, because of https://github.com/nervosnetwork/ckb/pull/1164
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think it's better to have 2 CI modes, one that could run on Travis but skip those tests, one runs on everything. The problem with commenting out, is that soon this might fail to build, and the most likely result would be those get deleted some time later. But I won't let those block merging.

// node will be banned, we need to add `listbanned` rpc and modify test code to assert that node has been banned
// https://bitcoincore.org/en/doc/0.16.0/rpc/network/listbanned/
// specs.insert("chain_fork_3", Box::new(ChainFork3));
// specs.insert("chain_fork_4", Box::new(ChainFork4));
// specs.insert("chain_fork_5", Box::new(ChainFork5));
// specs.insert("chain_fork_6", Box::new(ChainFork6));
// specs.insert("chain_fork_7", Box::new(ChainFork7));
specs.insert("mining_basic", Box::new(MiningBasic));
specs.insert("mining_bootstrap_cellbase", Box::new(BootstrapCellbase));
specs.insert("mining_template_size_limit", Box::new(TemplateSizeLimit));
Expand Down
11 changes: 10 additions & 1 deletion test/src/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::specs::TestProtocol;
use crate::utils::wait_until;
use crate::Node;
use bytes::Bytes;
use ckb_core::BlockNumber;
use ckb_core::{block::Block, BlockNumber};
use ckb_network::{
CKBProtocol, CKBProtocolContext, CKBProtocolHandler, NetworkConfig, NetworkController,
NetworkService, NetworkState, PeerIndex, ProtocolId,
Expand Down Expand Up @@ -145,6 +145,15 @@ impl Net {
});
}

// generate a same block on all nodes, exit IBD mode and return the tip block
pub fn exit_ibd_mode(&self) -> Block {
let block = self.nodes[0].new_block(None, None, None);
self.nodes.iter().for_each(|node| {
node.submit_block(&block);
});
block
}

pub fn waiting_for_sync(&self, target: BlockNumber) {
let rpc_clients: Vec<_> = self.nodes.iter().map(Node::rpc_client).collect();
let mut tip_numbers: HashSet<BlockNumber> = HashSet::with_capacity(self.nodes.len());
Expand Down
8 changes: 4 additions & 4 deletions test/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ impl Node {
}
}

pub fn connect(&self, node: &Node) {
let node_info = node.rpc_client().local_node_info();
pub fn connect(&self, outbound_peer: &Node) {
let node_info = outbound_peer.rpc_client().local_node_info();

let node_id = node_info.node_id;
let rpc_client = self.rpc_client();
rpc_client.add_node(
node_id.clone(),
format!("/ip4/127.0.0.1/tcp/{}", node.p2p_port),
format!("/ip4/127.0.0.1/tcp/{}", outbound_peer.p2p_port),
);

let result = wait_until(5, || {
Expand All @@ -125,7 +125,7 @@ impl Node {
});

if !result {
panic!("Connect timeout, node {}", node_id);
panic!("Connect outbound peer timeout, node id: {}", node_id);
}
}

Expand Down
1 change: 1 addition & 0 deletions test/src/specs/p2p/malformed_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ impl Spec for MalformedMessage {
fn run(&self, net: Net) {
info!("Connect node0");
let node0 = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node0);

info!("Test node should receive GetHeaders message from node0");
Expand Down
6 changes: 1 addition & 5 deletions test/src/specs/relay/block_relay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ pub struct BlockRelayBasic;

impl Spec for BlockRelayBasic {
fn run(&self, net: Net) {
net.exit_ibd_mode();
let node0 = &net.nodes[0];
let node1 = &net.nodes[1];
let node2 = &net.nodes[2];
// generate 1 block to exit IBD mode.
let block = node0.new_block(None, None, None);
node0.submit_block(&block);
node1.submit_block(&block);
node2.submit_block(&block);

info!("Generate new block on node1");
let hash = node1.generate_block();
Expand Down
15 changes: 6 additions & 9 deletions test/src/specs/relay/compact_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ impl Spec for CompactBlockEmptyParentUnknown {
// Case: Sent to node0 a parent-unknown empty block, node0 should be unable to reconstruct
// it and send us back a `GetHeaders` message
fn run(&self, net: Net) {
net.exit_ibd_mode();
let node = &net.nodes[0];
net.connect(node);
let (peer_id, _, _) = net.receive();
Expand Down Expand Up @@ -62,12 +63,10 @@ impl Spec for CompactBlockEmpty {
// Case: Send to node0 a parent-known empty block, node0 should be able to reconstruct it
fn run(&self, net: Net) {
let node = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node);
let (peer_id, _, _) = net.receive();

node.generate_block();
let _ = net.receive();

let new_empty_block = node.new_block(None, None, None);
net.send(
NetworkProtocol::RELAY.into(),
Expand All @@ -89,12 +88,10 @@ impl Spec for CompactBlockPrefilled {
// Case: Send to node0 a block with all transactions prefilled, node0 should be able to reconstruct it
fn run(&self, net: Net) {
let node = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node);
let (peer_id, _, _) = net.receive();

node.generate_block();
let _ = net.receive();

// Proposal a tx, and grow up into proposal window
let new_tx = node.new_transaction(node.get_tip_block().transactions()[0].hash().clone());
node.submit_block(
Expand Down Expand Up @@ -134,6 +131,7 @@ impl Spec for CompactBlockMissingTxs {
// back for requesting these missing txs
fn run(&self, net: Net) {
let node = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node);
let (peer_id, _, _) = net.receive();

Expand Down Expand Up @@ -182,14 +180,14 @@ pub struct CompactBlockLoseGetBlockTransactions;

impl Spec for CompactBlockLoseGetBlockTransactions {
fn run(&self, net: Net) {
net.exit_ibd_mode();
let node0 = &net.nodes[0];
net.connect(node0);
let (peer_id0, _, _) = net.receive();
let node1 = &net.nodes[1];
net.connect(node1);
let _ = net.receive();

node0.generate_block();
let new_tx = node0.new_transaction(node0.get_tip_block().transactions()[0].hash().clone());
node0.submit_block(
&node0
Expand Down Expand Up @@ -258,11 +256,10 @@ impl Spec for CompactBlockRelayParentOfOrphanBlock {
// orphan_block_pool now
fn run(&self, net: Net) {
let node = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node);
let (peer_id, _, _) = net.receive();

node.generate_block();

// Proposal a tx, and grow up into proposal window
let new_tx = node.new_transaction_spend_tip_cellbase();
node.submit_block(
Expand Down
14 changes: 3 additions & 11 deletions test/src/specs/relay/transaction_relay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ pub struct TransactionRelayBasic;

impl Spec for TransactionRelayBasic {
fn run(&self, net: Net) {
net.exit_ibd_mode();

let node0 = &net.nodes[0];
let node1 = &net.nodes[1];
let node2 = &net.nodes[2];
// generate 1 block to exit IBD mode.
let block = node0.new_block(None, None, None);
node0.submit_block(&block);
node1.submit_block(&block);
node2.submit_block(&block);

info!("Generate new transaction on node1");
node1.generate_block();
Expand Down Expand Up @@ -54,13 +51,8 @@ pub struct TransactionRelayMultiple;

impl Spec for TransactionRelayMultiple {
fn run(&self, net: Net) {
let block = net.exit_ibd_mode();
let node0 = &net.nodes[0];
// generate 1 block to exit IBD mode.
let block = node0.new_block(None, None, None);
net.nodes.iter().for_each(|node| {
node.submit_block(&block);
});

info!("Use generated block's cellbase as tx input");
let reward = block.transactions()[0].outputs()[0].capacity;
let txs_num = reward.as_u64() / MIN_CAPACITY;
Expand Down
9 changes: 3 additions & 6 deletions test/src/specs/sync/block_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl Spec for BlockSyncFromOne {
node0.generate_block();
});

node0.connect(node1);
node1.connect(node0);

let ret = wait_until(10, || {
let header0 = rpc_client0.get_tip_header();
Expand Down Expand Up @@ -122,14 +122,12 @@ impl Spec for BlockSyncDuplicatedAndReconnect {
// Case: Sync a header, sync a duplicated header, reconnect and sync a duplicated header
fn run(&self, net: Net) {
let node = &net.nodes[0];
net.exit_ibd_mode();
net.connect(node);
let (peer_id, _, _) = net
.receive_timeout(Duration::new(10, 0))
.expect("build connection with node");

// Exit IBD mode
node.generate_block();

// Sync a new header to `node`, `node` should send back a corresponding GetBlocks message
let block = node.new_block(None, None, None);
sync_header(&net, peer_id, &block);
Expand Down Expand Up @@ -191,8 +189,7 @@ impl Spec for BlockSyncOrphanBlocks {
fn run(&self, net: Net) {
let node0 = &net.nodes[0];
let node1 = &net.nodes[1];
// Exit IBD mode
node0.generate_block();
net.exit_ibd_mode();
net.connect(node0);
let (peer_id, _, _) = net
.receive_timeout(Duration::new(10, 0))
Expand Down
6 changes: 3 additions & 3 deletions test/src/specs/sync/chain_forks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl Spec for ChainFork1 {
node0.generate_blocks(2);

info!("Connect node0 to node1");
node0.connect(node1);
node1.connect(node0);
node0.waiting_for_sync(node1, 2);
info!("Disconnect node1");
node0.disconnect(node1);
Expand Down Expand Up @@ -62,8 +62,8 @@ impl Spec for ChainFork2 {
node0.generate_blocks(2);

info!("Connect all nodes");
node0.connect(node1);
node0.connect(node2);
node1.connect(node0);
node2.connect(node0);
net.waiting_for_sync(2);
info!("Disconnect all nodes");
net.disconnect_all();
Expand Down
3 changes: 1 addition & 2 deletions test/src/specs/sync/invalid_locator_size.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ pub struct InvalidLocatorSize;
impl Spec for InvalidLocatorSize {
fn run(&self, net: Net) {
info!("Connect node0");
net.exit_ibd_mode();
let node0 = &net.nodes[0];
net.connect(node0);
// get peer_id from GetHeaders message
let (peer_id, _, _) = net.receive();
// generate 1 block on node0, to exit IBD mode.
node0.generate_block();

let hashes: Vec<_> = (0..=MAX_LOCATOR_SIZE).map(|_| h256!("0x1")).collect();
let fbb = &mut FlatBufferBuilder::new();
Expand Down
8 changes: 4 additions & 4 deletions test/src/specs/sync/sync_timeout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ impl Spec for SyncTimeout {
node0.generate_blocks(2);

info!("Connect all nodes");
node0.connect(node1);
node0.connect(node2);
node0.connect(node3);
node0.connect(node4);
node1.connect(node0);
node2.connect(node0);
node3.connect(node0);
node4.connect(node0);
net.waiting_for_sync(2);

info!("Disconnect all nodes");
Expand Down