Skip to content

Commit 326bcf3

Browse files
obycodeobycode
committed
Merge branch 'develop' into feat/recover-events
2 parents 1be5091 + ae3d6d5 commit 326bcf3

File tree

10 files changed

+169
-506
lines changed

10 files changed

+169
-506
lines changed

‎stacks-common/src/libcommon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub mod consts {
8484

8585
/// this should be updated to the latest network epoch version supported by
8686
/// this node. this will be checked by the `validate_epochs()` method.
87-
pub const PEER_NETWORK_EPOCH: u32 = PEER_VERSION_EPOCH_2_5 as u32;
87+
pub const PEER_NETWORK_EPOCH: u32 = PEER_VERSION_EPOCH_3_0 as u32;
8888

8989
/// set the fourth byte of the peer version
9090
pub const PEER_VERSION_MAINNET: u32 = PEER_VERSION_MAINNET_MAJOR | PEER_NETWORK_EPOCH;

‎testnet/stacks-node/src/tests/epoch_205.rs

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,10 @@ fn test_exact_block_costs() {
109109
.collect();
110110

111111
test_observer::spawn();
112-
conf.events_observers.insert(EventObserverConfig {
113-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
114-
events_keys: vec![EventKeyType::AnyEvent, EventKeyType::MinedBlocks],
115-
timeout_ms: 1000,
116-
});
112+
test_observer::register(
113+
&mut conf,
114+
&[EventKeyType::AnyEvent, EventKeyType::MinedBlocks],
115+
);
117116

118117
let mut btcd_controller = BitcoinCoreController::new(conf.clone());
119118
btcd_controller
@@ -336,11 +335,7 @@ fn test_dynamic_db_method_costs() {
336335
};
337336

338337
test_observer::spawn();
339-
conf.events_observers.insert(EventObserverConfig {
340-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
341-
events_keys: vec![EventKeyType::AnyEvent],
342-
timeout_ms: 1000,
343-
});
338+
test_observer::register_any(&mut conf);
344339

345340
let mut btcd_controller = BitcoinCoreController::new(conf.clone());
346341
btcd_controller
@@ -774,11 +769,7 @@ fn test_cost_limit_switch_version205() {
774769
});
775770

776771
test_observer::spawn();
777-
conf.events_observers.insert(EventObserverConfig {
778-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
779-
events_keys: vec![EventKeyType::AnyEvent],
780-
timeout_ms: 1000,
781-
});
772+
test_observer::register_any(&mut conf);
782773

783774
let mut btcd_controller = BitcoinCoreController::new(conf.clone());
784775
btcd_controller
@@ -1032,11 +1023,7 @@ fn bigger_microblock_streams_in_2_05() {
10321023
conf.burnchain.pox_2_activation = Some(10_003);
10331024

10341025
test_observer::spawn();
1035-
conf.events_observers.insert(EventObserverConfig {
1036-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
1037-
events_keys: vec![EventKeyType::AnyEvent],
1038-
timeout_ms: 1000,
1039-
});
1026+
test_observer::register_any(&mut conf);
10401027

10411028
let mut btcd_controller = BitcoinCoreController::new(conf.clone());
10421029
btcd_controller

‎testnet/stacks-node/src/tests/epoch_21.rs

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ fn advance_to_2_1(
7171
conf.burnchain.peer_host = "localhost".to_string();
7272
conf.initial_balances.append(&mut initial_balances);
7373
conf.miner.block_reward_recipient = block_reward_recipient;
74-
75-
conf.events_observers.insert(EventObserverConfig {
76-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
77-
events_keys: vec![EventKeyType::AnyEvent],
78-
timeout_ms: 1000,
79-
});
74+
test_observer::register_any(&mut conf);
8075

8176
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();
8277
epochs[1].end_height = epoch_2_05;
@@ -577,11 +572,7 @@ fn transition_fixes_bitcoin_rigidity() {
577572
];
578573

579574
conf.initial_balances.append(&mut initial_balances);
580-
conf.events_observers.insert(EventObserverConfig {
581-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
582-
events_keys: vec![EventKeyType::AnyEvent],
583-
timeout_ms: 1000,
584-
});
575+
test_observer::register_any(&mut conf);
585576

586577
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();
587578
epochs[1].end_height = epoch_2_05;
@@ -1474,12 +1465,7 @@ fn transition_removes_pox_sunset() {
14741465
let (mut conf, miner_account) = neon_integration_test_conf();
14751466

14761467
test_observer::spawn();
1477-
1478-
conf.events_observers.insert(EventObserverConfig {
1479-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
1480-
events_keys: vec![EventKeyType::AnyEvent],
1481-
timeout_ms: 1000,
1482-
});
1468+
test_observer::register_any(&mut conf);
14831469

14841470
conf.initial_balances.push(InitialBalance {
14851471
address: spender_addr.clone(),
@@ -1790,12 +1776,7 @@ fn transition_empty_blocks() {
17901776
conf.burnchain.epochs = Some(epochs);
17911777

17921778
test_observer::spawn();
1793-
1794-
conf.events_observers.insert(EventObserverConfig {
1795-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
1796-
events_keys: vec![EventKeyType::AnyEvent],
1797-
timeout_ms: 1000,
1798-
});
1779+
test_observer::register_any(&mut conf);
17991780

18001781
let keychain = Keychain::default(conf.node.seed.clone());
18011782
let http_origin = format!("http://{}", &conf.node.rpc_bind);
@@ -4741,11 +4722,7 @@ fn trait_invocation_cross_epoch() {
47414722
amount: 200_000_000,
47424723
}];
47434724
conf.initial_balances.append(&mut initial_balances);
4744-
conf.events_observers.insert(EventObserverConfig {
4745-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
4746-
events_keys: vec![EventKeyType::AnyEvent],
4747-
timeout_ms: 1000,
4748-
});
4725+
test_observer::register_any(&mut conf);
47494726
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();
47504727
epochs[1].end_height = epoch_2_05;
47514728
epochs[2].start_height = epoch_2_05;
@@ -4987,12 +4964,7 @@ fn test_v1_unlock_height_with_current_stackers() {
49874964
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
49884965

49894966
test_observer::spawn();
4990-
4991-
conf.events_observers.insert(EventObserverConfig {
4992-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
4993-
events_keys: vec![EventKeyType::AnyEvent],
4994-
timeout_ms: 1000,
4995-
});
4967+
test_observer::register_any(&mut conf);
49964968
conf.initial_balances.append(&mut initial_balances);
49974969

49984970
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();
@@ -5253,12 +5225,7 @@ fn test_v1_unlock_height_with_delay_and_current_stackers() {
52535225
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
52545226

52555227
test_observer::spawn();
5256-
5257-
conf.events_observers.insert(EventObserverConfig {
5258-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
5259-
events_keys: vec![EventKeyType::AnyEvent],
5260-
timeout_ms: 1000,
5261-
});
5228+
test_observer::register_any(&mut conf);
52625229
conf.initial_balances.append(&mut initial_balances);
52635230

52645231
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();

‎testnet/stacks-node/src/tests/epoch_22.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,7 @@ fn disable_pox() {
134134
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
135135

136136
test_observer::spawn();
137-
138-
conf.events_observers.insert(EventObserverConfig {
139-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
140-
events_keys: vec![EventKeyType::AnyEvent],
141-
timeout_ms: 1000,
142-
});
137+
test_observer::register_any(&mut conf);
143138
conf.initial_balances.append(&mut initial_balances);
144139

145140
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();

‎testnet/stacks-node/src/tests/epoch_23.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,7 @@ fn trait_invocation_behavior() {
100100
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
101101

102102
test_observer::spawn();
103-
104-
conf.events_observers.insert(EventObserverConfig {
105-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
106-
events_keys: vec![EventKeyType::AnyEvent],
107-
timeout_ms: 1000,
108-
});
103+
test_observer::register_any(&mut conf);
109104
conf.initial_balances.append(&mut initial_balances);
110105

111106
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();

‎testnet/stacks-node/src/tests/epoch_24.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,7 @@ fn fix_to_pox_contract() {
152152
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
153153

154154
test_observer::spawn();
155-
156-
conf.events_observers.insert(EventObserverConfig {
157-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
158-
events_keys: vec![EventKeyType::AnyEvent],
159-
timeout_ms: 1000,
160-
});
155+
test_observer::register_any(&mut conf);
161156
conf.initial_balances.append(&mut initial_balances);
162157

163158
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();
@@ -792,12 +787,7 @@ fn verify_auto_unlock_behavior() {
792787
conf.miner.subsequent_attempt_time_ms = i64::MAX as u64;
793788

794789
test_observer::spawn();
795-
796-
conf.events_observers.insert(EventObserverConfig {
797-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
798-
events_keys: vec![EventKeyType::AnyEvent],
799-
timeout_ms: 1000,
800-
});
790+
test_observer::register_any(&mut conf);
801791
conf.initial_balances.append(&mut initial_balances);
802792

803793
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();

‎testnet/stacks-node/src/tests/epoch_25.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,7 @@ fn microblocks_disabled() {
8383
conf.miner.subsequent_attempt_time_ms = i64::max_value() as u64;
8484

8585
test_observer::spawn();
86-
87-
conf.events_observers.insert(EventObserverConfig {
88-
endpoint: format!("localhost:{}", test_observer::EVENT_OBSERVER_PORT),
89-
events_keys: vec![EventKeyType::AnyEvent],
90-
timeout_ms: 1000,
91-
});
86+
test_observer::register_any(&mut conf);
9287
conf.initial_balances.append(&mut initial_balances);
9388

9489
let mut epochs = core::STACKS_EPOCHS_REGTEST.to_vec();

0 commit comments

Comments
 (0)