Skip to content

test: fold conf fields and mempool rejects onto existing journeys #1022

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

Merged
reardencode merged 1 commit into from
Oct 15, 2026
Merged

test: fold conf fields and mempool rejects onto existing journeys #1022

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
11 changes: 0 additions & 11 deletions crates/rbitcoin-consensus/src/policy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,17 +299,6 @@ mod tests {
);
}

#[test]
fn libre_rejects_bad_annex() {
let mut tx = bare_tx(1);
tx.input[0].witness = Witness::from_slice(&[vec![0x01], vec![0x50, 0x01]]);
let weight = tx.weight().to_wu();
assert_eq!(
check_libre_admission(&tx, 50_000, weight),
PolicyResult::NonStandard("libre annex")
);
}

#[test]
fn policy_result_is_ok_alias() {
assert!(PolicyResult::Standard.is_ok());
Expand Down
96 changes: 0 additions & 96 deletions crates/rbitcoin-mempool/src/accept.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2240,39 +2240,6 @@ mod tests {
(ops, MapUtxoProvider { map })
}

/// Finding 011: duplicate inputs rejected before fee accounting.
#[test]
fn reject_duplicate_inputs() {
let dir = tmp_dir();
let (op, _, utxos) = chain_utxo(100_000);
let tx = Transaction {
version: Version::TWO,
lock_time: LockTime::ZERO,
input: vec![
TxIn {
previous_output: op,
script_sig: ScriptBuf::new(),
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
witness: Witness::new(),
},
TxIn {
previous_output: op, // same outpoint twice
script_sig: ScriptBuf::new(),
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
witness: Witness::new(),
},
],
output: vec![TxOut {
value: Amount::from_sat(50_000),
script_pubkey: ScriptBuf::from_bytes(vec![0x51]),
}],
};
let mut mp = ActiveMempool::open_or_create(&dir).unwrap();
let err = mp.accept_tx(&tx, &utxos, TIP_OK).unwrap_err();
assert!(matches!(err, AcceptError::InputsDuplicate), "got {err}");
let _ = std::fs::remove_dir_all(&dir);
}

/// Finding 011: absolute nLockTime height form not final at tip+1.
#[test]
fn reject_non_final_locktime_height() {
Expand Down Expand Up @@ -2408,33 +2375,6 @@ mod tests {
let _ = std::fs::remove_dir_all(&dir);
}

/// Finding 010: provider returns no coin for a spent/missing outpoint → reject.
#[test]
fn reject_when_provider_has_no_unspent_coin() {
let dir = tmp_dir();
let op = OutPoint {
txid: Txid::from_byte_array([0xcd; 32]),
vout: 0,
};
let tx = spend_tx(op, 1_000);
let utxos = MapUtxoProvider {
map: HashMap::new(), // spent or unknown → no coin
};
let mut mp = ActiveMempool::open_or_create(&dir).unwrap();
let err = mp
.accept_tx(&tx, &utxos, TIP_OK)
.expect_err("must not admit");
// Orphanage parks missing parents; empty map → orphaned or missing.
assert!(
matches!(
err,
AcceptError::Orphaned { .. } | AcceptError::MissingPrevout(_)
),
"got {err}"
);
assert_eq!(mp.live_count(), 0);
let _ = std::fs::remove_dir_all(&dir);
}
/// The rolling floor starts at the configured minimum. A lower
/// `-minrelaytxfee` is the advertised floor. An eviction that already
/// raised the rolling floor stays above that new minimum.
Expand Down Expand Up @@ -2719,19 +2659,6 @@ mod tests {
let _ = std::fs::remove_dir_all(&dir);
}

#[test]
fn reject_low_feerate() {
let dir = tmp_dir();
let (op, _, utxos) = chain_utxo(100_000);
// fee 1 sat — below 0.1 sat/vB for any real tx weight
let tx = spend_tx(op, 99_999);
let mut mp = ActiveMempool::open_or_create(&dir).unwrap();
let err = mp.accept_tx(&tx, &utxos, TIP_OK).unwrap_err();
assert!(matches!(err, AcceptError::Policy("min relay fee")));
assert_eq!(mp.live_count(), 0);
let _ = std::fs::remove_dir_all(&dir);
}

#[test]
fn dust_and_op_true_allowed() {
let dir = tmp_dir();
Expand Down Expand Up @@ -2825,17 +2752,6 @@ mod tests {
mp.graph.get(&tx.compute_txid()).unwrap().sigop_cost
}

#[test]
fn accept_tx_records_full_sigop_cost_for_p2sh_and_p2wsh() {
let dir = tmp_dir();
let (utxos, p2sh, p2wsh) = p2sh_p2wsh_multisig_spends();
let mut mp = ActiveMempool::open_or_create(&dir).unwrap();
mp.accept_tx(&p2sh, &utxos, TIP_OK).expect("p2sh");
mp.accept_tx(&p2wsh, &utxos, TIP_OK).expect("p2wsh");
assert_eq!(live_sigops(&mp, &p2sh), 8);
assert_eq!(live_sigops(&mp, &p2wsh), 2);
}

#[test]
fn package_and_reorg_readmit_record_sigop_cost() {
let dir = tmp_dir();
Expand Down Expand Up @@ -2924,18 +2840,6 @@ mod tests {
assert_eq!(live_sigops(&mp, &child), 80);
}

#[test]
fn annex_reject() {
let dir = tmp_dir();
let (op, _, utxos) = chain_utxo(100_000);
let mut tx = spend_tx(op, 90_000);
tx.input[0].witness = Witness::from_slice(&[vec![0x01], vec![0x50, 0x01]]);
let mut mp = ActiveMempool::open_or_create(&dir).unwrap();
let err = mp.accept_tx(&tx, &utxos, TIP_OK).unwrap_err();
assert!(matches!(err, AcceptError::Policy("libre annex")));
let _ = std::fs::remove_dir_all(&dir);
}

#[test]
fn evaluate_after_script_rbf_leaves_conflict() {
let dir = tmp_dir();
Expand Down
88 changes: 39 additions & 49 deletions crates/rbitcoin-node/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,15 @@ mod tests {
.unwrap_err()
.to_string();
assert!(err.contains("sp_tweaks_dust"), "{err}");
let bad_line = dir.join("bad.conf");
std::fs::write(&bad_line, "secret-token-xyz\n").unwrap();
let err = NodeConfig::default()
.merge_conf_file(&bad_line)
.unwrap_err()
.to_string();
assert!(err.contains("bad.conf:1"), "{err}");
assert!(err.contains("expected key=value"), "{err}");
assert!(!err.contains("secret-token-xyz"), "{err}");
match operator_config_from_args(["rbitcoin-node", "--conf", bad_dust.to_str().unwrap()]) {
Err(code) => assert_exit(code, ExitCode::from(2)),
Ok(other) => panic!("bad sp_tweaks_dust conf assembled: {other:?}"),
Expand Down Expand Up @@ -955,6 +964,9 @@ mod tests {
assert_eq!(cfg.check_blocks, Some(stored));
assert_eq!(cfg.check_blocks_window(), window, "{arg}");
}
let mut bad_blocks = NodeConfig::default();
let bad = bad_blocks.apply_kv("check_blocks", "nope").unwrap_err();
assert!(bad.to_string().contains("check-blocks"), "{bad}");
for off in ["--no-listen", "--listen=0"] {
let cfg = ready_config(["rbitcoin-node", off]);
assert_eq!(cfg.listen.p2p, P2pListen::Off, "{off}");
Expand Down Expand Up @@ -1029,6 +1041,33 @@ mod tests {
.validate()
.unwrap_or_else(|e| panic!("{argv:?} must validate: {e}"));
}

assert_eq!(
ready_config(["rbitcoin-node"]).electrum_max_subs,
rbitcoin_electrum::DEFAULT_MAX_SCRIPTHASH_SUBS
);
assert_eq!(
ready_config(["rbitcoin-node", "--electrum-max-subs", "25000"]).electrum_max_subs,
25_000
);
assert_eq!(
ready_config(["rbitcoin-node", "--electrum-max-subs=5"]).electrum_max_subs,
5
);
let mut subs = NodeConfig::default();
let zero = subs.apply_kv("electrum_max_subs", "0").unwrap_err();
assert!(format!("{zero}").contains(">= 1"), "{zero}");
let bad = subs.apply_kv("electrum_max_subs", "nope").unwrap_err();
assert!(format!("{bad}").contains("electrum_max_subs"), "{bad}");
assert_eq!(
subs.electrum_max_subs,
rbitcoin_electrum::DEFAULT_MAX_SCRIPTHASH_SUBS,
"a refused value leaves the default"
);
assert!(
ready_config(["rbitcoin-node", "--esplora-block-template=1"]).esplora_block_template
);
assert!(!ready_config(["rbitcoin-node", "--esplora-onion=0"]).esplora_onion);
}

include!("overlay_config_journey.rs");
Expand Down Expand Up @@ -1082,55 +1121,6 @@ mod tests {
);
}

#[test]
fn electrum_max_subs_cli_conf_and_bounds() {
assert_eq!(
ready_config(["rbitcoin-node"]).electrum_max_subs,
rbitcoin_electrum::DEFAULT_MAX_SCRIPTHASH_SUBS
);
assert_eq!(
ready_config(["rbitcoin-node", "--electrum-max-subs", "25000"]).electrum_max_subs,
25_000
);
assert_eq!(
ready_config(["rbitcoin-node", "--electrum-max-subs=5"]).electrum_max_subs,
5
);
let mut c = NodeConfig::default();
let zero = c.apply_kv("electrum_max_subs", "0").unwrap_err();
assert!(format!("{zero}").contains(">= 1"), "{zero}");
let bad = c.apply_kv("electrum_max_subs", "nope").unwrap_err();
assert!(format!("{bad}").contains("electrum_max_subs"), "{bad}");
assert_eq!(
c.electrum_max_subs,
rbitcoin_electrum::DEFAULT_MAX_SCRIPTHASH_SUBS,
"a refused value leaves the default"
);
}

#[test]
fn max_sh_creates_and_esplora_block_template_cli_hyphens() {
let omitted = ready_config(["rbitcoin-node"]);
assert_eq!(
omitted.max_sh_creates,
rbitcoin_query::DEFAULT_MAX_SH_CREATES
);
assert!(!omitted.esplora_block_template);
let n = ready_config(["rbitcoin-node", "--max-sh-creates", "42"]);
assert_eq!(n.max_sh_creates, 42);
let eq = ready_config(["rbitcoin-node", "--max-sh-creates=9"]);
assert_eq!(eq.max_sh_creates, 9);
let gbt = ready_config(["rbitcoin-node", "--esplora-block-template"]);
assert!(gbt.esplora_block_template);
let gbt_eq = ready_config(["rbitcoin-node", "--esplora-block-template=1"]);
assert!(gbt_eq.esplora_block_template);
let off = ready_config(["rbitcoin-node", "--esplora-block-template=0"]);
assert!(!off.esplora_block_template);
assert!(NodeConfig::default().esplora_onion);
let onion_off = ready_config(["rbitcoin-node", "--esplora-onion=0"]);
assert!(!onion_off.esplora_onion);
}

/// RPC binds only after catch-up, so a bad `--rpc-cookie-file` must fail
/// the launch rather than surface as a warning after IBD.
#[test]
Expand Down
63 changes: 0 additions & 63 deletions crates/rbitcoin-node/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,23 +1664,6 @@ mod tests {
assert_eq!(c.rpc.work_queue, Some(4));
}

#[test]
fn conf_error_names_the_file_and_line() {
let dir = std::env::temp_dir().join(format!("rbitcoin-conf-line-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
let path = dir.join("bad.conf");
std::fs::write(&path, "secret-token-xyz\n").unwrap();
let err = NodeConfig::default()
.merge_conf_file(&path)
.unwrap_err()
.to_string();
assert!(err.contains("bad.conf:1"), "{err}");
assert!(err.contains("expected key=value"), "{err}");
assert!(!err.contains("secret-token-xyz"), "{err}");
let _ = std::fs::remove_dir_all(&dir);
}

#[test]
fn tor_control_password_rejects_a_line_break() {
let mut c = NodeConfig::default();
Expand Down Expand Up @@ -1927,31 +1910,6 @@ mod tests {
}
}

#[test]
fn check_blocks_apply_kv_zero_is_all() {
let mut c = NodeConfig::default();
assert_eq!(c.check_blocks, None);
assert_eq!(c.check_blocks_window(), rbitcoin_store::VERIFY_TIP_BLOCKS);
assert_eq!(c.apply_kv("check_blocks", "6").unwrap(), ConfApply::Applied);
assert_eq!(c.check_blocks, Some(6));
assert_eq!(c.check_blocks_window(), 6);
assert_eq!(c.apply_kv("check-blocks", "0").unwrap(), ConfApply::Applied);
assert_eq!(c.check_blocks, Some(0));
assert_eq!(c.check_blocks_window(), 0);
assert_eq!(
c.apply_kv("check_blocks", "-1").unwrap(),
ConfApply::Applied
);
assert_eq!(c.check_blocks, Some(-1));
assert_eq!(c.check_blocks_window(), 0);
let bad = c.apply_kv("check_blocks", "nope").unwrap_err();
assert!(bad.to_string().contains("check-blocks"), "{bad}");
assert_eq!(
c.apply_kv("checkblocks", "6").unwrap(),
ConfApply::Unknown("checkblocks".into())
);
}

#[test]
fn blocks_dir_is_not_an_operator_key() {
let mut c = NodeConfig::default();
Expand Down Expand Up @@ -2042,27 +2000,6 @@ mod tests {
assert_eq!(c2.net_perms.whitebind.len(), 1);
}

#[test]
fn prefillcompact_cli_conf_default_on() {
let mut c = NodeConfig::default();
assert!(c.prefill_compact);
match c.apply_kv("prefillcompact", "0").unwrap() {
ConfApply::Unknown(k) => assert_eq!(k, "prefillcompact"),
other => panic!("{other:?}"),
}
assert!(c.prefill_compact);
assert_eq!(
c.apply_kv("prefill_compact", "0").unwrap(),
ConfApply::Applied
);
assert!(!c.prefill_compact);
assert_eq!(
c.apply_kv("prefill_compact", "1").unwrap(),
ConfApply::Applied
);
assert!(c.prefill_compact);
}

#[test]
fn default_datadir_is_native_cwd_relative() {
let p = NodeConfig::default_datadir();
Expand Down
Loading