Skip to content

Commit c2f79e9

Browse files
committed
fix: handle burn amount in assertion
1 parent dd35d77 commit c2f79e9

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

testnet/stacks-node/src/tests/nakamoto_integrations.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11113,8 +11113,8 @@ fn reload_miner_config() {
1111311113
// setup sender + recipient for some test stx transfers
1111411114
// these are necessary for the interim blocks to get mined at all
1111511115
let sender_addr = tests::to_addr(&sender_sk);
11116-
let old_burn_fee_cap: u64 = 200000;
11117-
conf.burnchain.burn_fee_cap = 200000;
11116+
let old_burn_fee_cap: u64 = 100000;
11117+
conf.burnchain.burn_fee_cap = old_burn_fee_cap;
1111811118
conf.add_initial_balance(PrincipalData::from(sender_addr).to_string(), 1000000);
1111911119
conf.add_initial_balance(PrincipalData::from(signer_addr).to_string(), 100000);
1112011120

@@ -11149,8 +11149,6 @@ fn reload_miner_config() {
1114911149
file.write_all(new_config.as_bytes()).unwrap();
1115011150
};
1115111151

11152-
update_config(100000, 50);
11153-
1115411152
let mut run_loop = boot_nakamoto::BootRunLoop::new(conf.clone()).unwrap();
1115511153
let run_loop_stopper = run_loop.get_termination_switch();
1115611154
let counters = run_loop.counters();
@@ -11180,6 +11178,8 @@ fn reload_miner_config() {
1118011178

1118111179
wait_for_first_naka_block_commit(60, &commits_submitted);
1118211180

11181+
next_block_and_mine_commit(&mut btc_regtest_controller, 60, &conf, &counters).unwrap();
11182+
next_block_and_mine_commit(&mut btc_regtest_controller, 60, &conf, &counters).unwrap();
1118311183
next_block_and_mine_commit(&mut btc_regtest_controller, 60, &conf, &counters).unwrap();
1118411184

1118511185
let burn_blocks = test_observer::get_burn_blocks();
@@ -11195,7 +11195,9 @@ fn reload_miner_config() {
1119511195
.map(|r| r.get("amt").unwrap().as_u64().unwrap())
1119611196
.sum::<u64>();
1119711197

11198-
assert_eq!(reward_amount, old_burn_fee_cap);
11198+
let burn_amount = burn_block.get("burn_amount").unwrap().as_u64().unwrap();
11199+
11200+
assert_eq!(reward_amount + burn_amount, old_burn_fee_cap);
1119911201

1120011202
next_block_and_mine_commit(&mut btc_regtest_controller, 60, &conf, &counters).unwrap();
1120111203

@@ -11221,7 +11223,9 @@ fn reload_miner_config() {
1122111223
.map(|r| r.get("amt").unwrap().as_u64().unwrap())
1122211224
.sum::<u64>();
1122311225

11224-
assert_eq!(reward_amount, new_amount);
11226+
let burn_amount = burn_block.get("burn_amount").unwrap().as_u64().unwrap();
11227+
11228+
assert_eq!(reward_amount + burn_amount, new_amount);
1122511229

1122611230
coord_channel
1122711231
.lock()

0 commit comments

Comments
 (0)