add end-to-end integration tests to verify that blocks propagate between two NAT'ed miners, and between two NAT'ed miners where the only shared node may fall behind (i.e. is not the master node)

net-test/tests/test_2_nat_miners.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# This test creates a network that looks like this:
+#
+# Miner (NAT'ed) <-----> Non-mining Master (public) <-----> Miner (NAT'ed)
+#
+# NAT'ing is emulated by having each miner ban all other miners, so they never talk to each other.
+
+source ./config.sh
+PROCESS_EXIT_AT_BLOCK_HEIGHT=450
+
+source "$__BIN/start.sh"
+source ./testlib.sh
+
+set -uo pipefail
+
+NAME="test-2-nat-miners"
+
+with_master() {
+   master_config "master-$NAME" "127.0.0.1" "false"
+}
+
+with_miner_1() {
+   miner_config "miner-1-$NAME" "21443" "21444"
+}
+
+with_miner_2() {
+   miner_config "miner-2-$NAME" "22443" "22444"
+}
+
+with_master
+    set_inbound_walks "false"
+    start_node &
+    MASTER_PID=$!
+    wait_node || exit_error "Master node failed to boot up"
+
+with_miner_1
+    ban_peer "127.0.0.1" "22444"
+    set_nat "true"
+    start_node &
+    MINER_1_PID=$!
+
+with_miner_2
+    ban_peer "127.0.0.1" "21444"
+    set_nat "true"
+    start_node &
+    MINER_2_PID=$!
+
+with_miner_1
+    wait_node || exit_error "Miner node 1 failed to boot up"
+
+with_miner_2
+    wait_node || exit_error "Miner node 2 failed to boot up"
+
+with_master
+    wait_until_burn_block 300 || exit_error "Master node failed to reach block 300"
+
+with_miner_1
+    wait_until_burn_block 300 || exit_error "Miner 1 failed to reach block 300"
+
+with_miner_2
+    wait_until_burn_block 300 || exit_error "Miner 2 failed to reach block 300"
+
+wait_pids $MASTER_PID $MINER_1_PID $MINER_2_PID
+
+with_master
+    check_chain_quality 90 90 100
+    if [ $? -ne 0 ]; then
+       exit_error "Chain quality check failed"
+    fi
+    exit 0
+

net-test/tests/test_2_nat_miners_1_follower.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# This test creates a network that looks like this:
+#                     
+#                    Non-mining master (public)
+#                           ^
+#                           |
+#                           |
+#                           v
+# Miner (NAT'ed) <-----> Follower (public) <-----> Miner (NAT'ed)
+#
+# NAT'ing is emulated by having each miner ban all other miners, so they never talk to each other.
+# Miners only talk to the follower.  Only the follower talks to the master.  This is also enforced by bans.
+
+source ./config.sh
+PROCESS_EXIT_AT_BLOCK_HEIGHT=450
+
+source "$__BIN/start.sh"
+source ./testlib.sh
+
+set -uo pipefail
+
+NAME="test-2-nat-miners-1-follower"
+
+with_master() {
+   master_config "master-$NAME" "127.0.0.1" "false"
+}
+
+with_follower() {
+   follower_config "follower-$NAME" "31443" "31444"
+}
+
+with_miner_1() {
+   miner_config "miner-1-$NAME" "21443" "21444"
+}
+
+with_miner_2() {
+   miner_config "miner-2-$NAME" "22443" "22444"
+}
+
+with_master
+    ban_peer "127.0.0.1" "21444"
+    ban_peer "127.0.0.1" "22444"
+    start_node &
+    MASTER_PID=$!
+    wait_node || exit_error "Master node failed to boot up"
+
+with_follower
+    set_inbound_walks "false"
+    start_node &
+    FOLLOWER_PID=$!
+
+with_miner_1
+    ban_peer "127.0.0.1" "22444"
+    ban_peer "127.0.0.1" "20444"
+    set_nat "true"
+    bootstrap "127.0.0.1" "31444"
+    start_node &
+    MINER_1_PID=$!
+
+with_miner_2
+    ban_peer "127.0.0.1" "21444"
+    ban_peer "127.0.0.1" "20444"
+    bootstrap "127.0.0.1" "31444"
+    set_nat "true"
+    start_node &
+    MINER_2_PID=$!
+
+with_follower
+    wait_node || exit_error "Follower node failed to boot up"
+
+with_miner_1
+    wait_node || exit_error "Miner node 1 failed to boot up"
+
+with_miner_2
+    wait_node || exit_error "Miner node 2 failed to boot up"
+
+with_master
+    wait_until_burn_block 300 || exit_error "Master node failed to reach block 300"
+
+with_follower
+    wait_until_burn_block 300 || exit_error "Follower node failed to reach block 300"
+
+with_miner_1
+    wait_until_burn_block 300 || exit_error "Miner 1 failed to reach block 300"
+
+with_miner_2
+    wait_until_burn_block 300 || exit_error "Miner 2 failed to reach block 300"
+
+wait_pids $MASTER_PID $MINER_1_PID $MINER_2_PID $FOLLOWER_PID
+
+with_master
+    check_chain_quality 90 90 100
+    if [ $? -ne 0 ]; then
+       exit_error "Chain quality check failed"
+    fi
+    exit 0