Skip to content

Commit 407d8e7

Browse files
simzzzsimzzz
committed
requested changes
1 parent 6830ed1 commit 407d8e7

File tree

4 files changed

+43
-49
lines changed

4 files changed

+43
-49
lines changed

‎primitives/src/test_util.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,16 +341,16 @@ impl ServerSetup {
341341
};
342342
let heartbeat_res = ValidatorMessagesListResponse {
343343
messages: vec![ValidatorMessage {
344-
from: DUMMY_CAMPAIGN.channel.leader,
344+
from: channel.leader,
345345
received: Utc::now(),
346346
msg: MessageTypes::Heartbeat(heartbeat),
347347
}],
348348
};
349349
Mock::given(method("GET"))
350350
.and(path(format!(
351351
"/v5/channel/{}/validator-messages/{}/{}",
352-
DUMMY_CAMPAIGN.channel.id(),
353-
DUMMY_CAMPAIGN.channel.leader,
352+
channel.id(),
353+
channel.leader,
354354
"Heartbeat",
355355
)))
356356
.and(query_param("limit", "1"))

‎validator_worker/src/follower.rs

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -337,15 +337,15 @@ async fn on_error<'a, C: Unlocked + 'static>(
337337
#[cfg(test)]
338338
mod test {
339339
use super::*;
340-
use crate::sentry_interface::{AuthToken, ChainsValidators, Validator};
340+
use crate::sentry_interface::{ChainsValidators, Validator};
341341
use adapter::dummy::{Adapter, Dummy, Options};
342342
use chrono::Utc;
343343
use primitives::{
344344
balances::UncheckedState,
345-
config::{configuration, Environment},
345+
config::GANACHE_CONFIG,
346346
test_util::{
347-
discard_logger, ServerSetup, ADVERTISER, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER,
348-
DUMMY_VALIDATOR_LEADER, FOLLOWER, GUARDIAN, GUARDIAN_2, IDS, LEADER, PUBLISHER,
347+
discard_logger, ServerSetup, ADVERTISER, DUMMY_AUTH, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER,
348+
DUMMY_VALIDATOR_LEADER, FOLLOWER, CREATOR, GUARDIAN_2, IDS, LEADER, PUBLISHER,
349349
PUBLISHER_2,
350350
},
351351
util::ApiUrl,
@@ -361,20 +361,18 @@ mod test {
361361

362362
let adapter = Adapter::with_unlocked(Dummy::init(Options {
363363
dummy_identity: IDS[&LEADER],
364-
dummy_auth_tokens: vec![(IDS[&LEADER].to_address(), "AUTH_Leader".into())]
365-
.into_iter()
366-
.collect(),
364+
dummy_auth_tokens: DUMMY_AUTH.clone(),
367365
}));
368366
let logger = discard_logger();
369367

370368
let mut validators: HashMap<ValidatorId, Validator> = HashMap::new();
371369
let leader = Validator {
372370
url: ApiUrl::from_str(&format!("{}/leader", server.uri())).expect("should be valid"),
373-
token: AuthToken::default(),
371+
token: DUMMY_AUTH.get(&*LEADER).expect("should retrieve").to_string(),
374372
};
375373
let follower = Validator {
376374
url: ApiUrl::from_str(&format!("{}/follower", server.uri())).expect("should be valid"),
377-
token: AuthToken::default(),
375+
token: DUMMY_AUTH.get(&*FOLLOWER).expect("should retrieve").to_string(),
378376
};
379377
validators.insert(DUMMY_VALIDATOR_LEADER.id, leader);
380378
validators.insert(DUMMY_VALIDATOR_FOLLOWER.id, follower);
@@ -390,7 +388,7 @@ mod test {
390388
#[tokio::test]
391389
async fn test_follower_tick() {
392390
let server_setup = ServerSetup::init(&DUMMY_CAMPAIGN.channel).await;
393-
let config = configuration(Environment::Development, None).expect("Should get Config");
391+
let config = GANACHE_CONFIG.clone();
394392
let sentry = setup_sentry(&server_setup.server, &config).await;
395393

396394
let channel_context = config
@@ -407,10 +405,10 @@ mod test {
407405
.spend(*ADVERTISER, *PUBLISHER_2, UnifiedNum::from_u64(1000))
408406
.expect("should spend");
409407
balances
410-
.spend(*GUARDIAN, *PUBLISHER, UnifiedNum::from_u64(1000))
408+
.spend(*CREATOR, *PUBLISHER, UnifiedNum::from_u64(1000))
411409
.expect("should spend");
412410
balances
413-
.spend(*GUARDIAN, *PUBLISHER_2, UnifiedNum::from_u64(1000))
411+
.spend(*CREATOR, *PUBLISHER_2, UnifiedNum::from_u64(1000))
414412
.expect("should spend");
415413
balances
416414
};
@@ -425,7 +423,7 @@ mod test {
425423
},
426424
);
427425
spenders.insert(
428-
*GUARDIAN,
426+
*CREATOR,
429427
Spender {
430428
total_deposited: UnifiedNum::from_u64(10_000),
431429
total_spent: Some(UnifiedNum::from_u64(2000)),
@@ -446,7 +444,7 @@ mod test {
446444
},
447445
);
448446
all_spenders.insert(
449-
*GUARDIAN,
447+
*CREATOR,
450448
Spender {
451449
total_deposited: UnifiedNum::from_u64(u64::MAX),
452450
total_spent: None,
@@ -541,7 +539,7 @@ mod test {
541539
)
542540
.expect("should encode");
543541
let new_state: NewState<UncheckedState> = NewState {
544-
state_root: state_root,
542+
state_root,
545543
signature: IDS[&*FOLLOWER].to_checksum(),
546544
balances: proposed_balances.into_unchecked(),
547545
};
@@ -581,7 +579,7 @@ mod test {
581579
)
582580
.expect("should encode");
583581
let new_state: NewState<UncheckedState> = NewState {
584-
state_root: state_root,
582+
state_root,
585583
signature: IDS[&*LEADER].to_checksum(),
586584
balances: proposed_balances.into_unchecked(),
587585
};
@@ -627,7 +625,7 @@ mod test {
627625
)
628626
.expect("should encode");
629627
let new_state: NewState<UncheckedState> = NewState {
630-
state_root: state_root,
628+
state_root,
631629
signature: IDS[&*LEADER].to_checksum(),
632630
balances: proposed_balances.into_unchecked(),
633631
};
@@ -667,7 +665,7 @@ mod test {
667665
.spend(*ADVERTISER, *PUBLISHER, UnifiedNum::from_u64(200_000))
668666
.expect("should spend");
669667
our_balances
670-
.spend(*GUARDIAN, *PUBLISHER_2, UnifiedNum::from_u64(200_000))
668+
.spend(*CREATOR, *PUBLISHER_2, UnifiedNum::from_u64(200_000))
671669
.expect("should spend");
672670

673671
let state_root = get_initial_balances()
@@ -677,7 +675,7 @@ mod test {
677675
)
678676
.expect("should encode");
679677
let new_state: NewState<UncheckedState> = NewState {
680-
state_root: state_root,
678+
state_root,
681679
signature: IDS[&*LEADER].to_checksum(),
682680
balances: get_initial_balances().into_unchecked(),
683681
};
@@ -702,8 +700,8 @@ mod test {
702700
// Case where no NewState is returned
703701
{
704702
// Setting up the expected response
705-
let _mock_guard = server_setup.setup_new_state_response(None).await;
706-
let _mock_guard = server_setup.setup_approve_state_response(None).await;
703+
let _mock_guard_new_state = server_setup.setup_new_state_response(None).await;
704+
let _mock_guard_approve_state = server_setup.setup_approve_state_response(None).await;
707705

708706
let tick_status = tick(
709707
&sentry,
@@ -733,13 +731,13 @@ mod test {
733731
signature: IDS[&*LEADER].to_checksum(),
734732
balances: get_initial_balances().into_unchecked(),
735733
};
736-
let _mock_guard = server_setup.setup_new_state_response(Some(new_state)).await;
734+
let _mock_guard_new_state = server_setup.setup_new_state_response(Some(new_state)).await;
737735
let approve_state = ApproveState {
738736
state_root,
739737
signature: IDS[&*FOLLOWER].to_checksum(),
740738
is_healthy: true,
741739
};
742-
let _mock_guard = server_setup
740+
let _mock_guard_approve_state = server_setup
743741
.setup_approve_state_response(Some(approve_state))
744742
.await;
745743

@@ -818,7 +816,7 @@ mod test {
818816
)
819817
.expect("should encode");
820818
let new_state: NewState<UncheckedState> = NewState {
821-
state_root: state_root,
819+
state_root,
822820
signature: IDS[&*LEADER].to_checksum(),
823821
balances: get_initial_balances().into_unchecked(),
824822
};
@@ -834,7 +832,7 @@ mod test {
834832
assert!(matches!(res, ApproveStateResult::Sent(Some(..))));
835833
let propagated_to = match res {
836834
ApproveStateResult::Sent(propagated_to) => propagated_to,
837-
_ => None, // Shouldn't happen
835+
_ => panic!("Shouldn't happen"),
838836
};
839837
let propagated_to: Vec<ValidatorId> = propagated_to
840838
.unwrap()

‎validator_worker/src/heartbeat.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ async fn send_heartbeat<C: Unlocked + 'static>(
7777
#[cfg(test)]
7878
mod test {
7979
use super::*;
80-
use crate::sentry_interface::{AuthToken, ChainsValidators, Validator};
80+
use crate::sentry_interface::{ChainsValidators, Validator};
8181
use adapter::dummy::{Adapter, Dummy, Options};
8282
use chrono::{Duration, Utc};
8383
use primitives::{
84-
config::{configuration, Environment},
84+
config::GANACHE_CONFIG,
8585
sentry::{SuccessResponse, ValidatorMessage, ValidatorMessagesListResponse},
8686
test_util::{
87-
discard_logger, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER, DUMMY_VALIDATOR_LEADER,
87+
discard_logger, DUMMY_AUTH, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER, DUMMY_VALIDATOR_LEADER,
8888
FOLLOWER, IDS, LEADER,
8989
},
9090
util::ApiUrl,
@@ -127,20 +127,18 @@ mod test {
127127

128128
let adapter = Adapter::with_unlocked(Dummy::init(Options {
129129
dummy_identity: IDS[&LEADER],
130-
dummy_auth_tokens: vec![(IDS[&LEADER].to_address(), "AUTH_Leader".into())]
131-
.into_iter()
132-
.collect(),
130+
dummy_auth_tokens: DUMMY_AUTH.clone(),
133131
}));
134132
let logger = discard_logger();
135133

136134
let mut validators: HashMap<ValidatorId, Validator> = HashMap::new();
137135
let leader = Validator {
138136
url: ApiUrl::from_str(&format!("{}/leader", server.uri())).expect("should be valid"),
139-
token: AuthToken::default(),
137+
token: DUMMY_AUTH.get(&*LEADER).expect("should be valid").to_string(),
140138
};
141139
let follower = Validator {
142140
url: ApiUrl::from_str(&format!("{}/follower", server.uri())).expect("should be valid"),
143-
token: AuthToken::default(),
141+
token: DUMMY_AUTH.get(&*FOLLOWER).expect("should be valid").to_string(),
144142
};
145143
validators.insert(DUMMY_VALIDATOR_LEADER.id, leader);
146144
validators.insert(DUMMY_VALIDATOR_FOLLOWER.id, follower);
@@ -176,7 +174,7 @@ mod test {
176174

177175
#[tokio::test]
178176
async fn test_heartbeats() {
179-
let config = configuration(Environment::Development, None).expect("Should get Config");
177+
let config = GANACHE_CONFIG.clone();
180178
let server = setup_mock_server().await;
181179
let sentry = setup_sentry(&server, &config).await;
182180
{

‎validator_worker/src/leader.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ async fn on_new_accounting<C: Unlocked + 'static>(
131131
#[cfg(test)]
132132
mod test {
133133
use super::*;
134-
use crate::sentry_interface::{AuthToken, ChainsValidators, Validator};
134+
use crate::sentry_interface::{ChainsValidators, Validator};
135135
use adapter::dummy::{Adapter, Dummy, Options};
136136
use primitives::{
137137
balances::UncheckedState,
138-
config::{configuration, Environment},
138+
config::GANACHE_CONFIG,
139139
test_util::{
140-
discard_logger, ServerSetup, ADVERTISER, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER,
141-
DUMMY_VALIDATOR_LEADER, FOLLOWER, GUARDIAN, IDS, LEADER, PUBLISHER, PUBLISHER_2,
140+
discard_logger, ServerSetup, ADVERTISER, DUMMY_AUTH, DUMMY_CAMPAIGN, DUMMY_VALIDATOR_FOLLOWER,
141+
DUMMY_VALIDATOR_LEADER, FOLLOWER, CREATOR, IDS, LEADER, PUBLISHER, PUBLISHER_2,
142142
},
143143
util::ApiUrl,
144144
validator::messages::NewState,
@@ -153,20 +153,18 @@ mod test {
153153

154154
let adapter = Adapter::with_unlocked(Dummy::init(Options {
155155
dummy_identity: IDS[&LEADER],
156-
dummy_auth_tokens: vec![(IDS[&LEADER].to_address(), "AUTH_Leader".into())]
157-
.into_iter()
158-
.collect(),
156+
dummy_auth_tokens: DUMMY_AUTH.clone(),
159157
}));
160158
let logger = discard_logger();
161159

162160
let mut validators: HashMap<ValidatorId, Validator> = HashMap::new();
163161
let leader = Validator {
164162
url: ApiUrl::from_str(&format!("{}/leader", server.uri())).expect("should be valid"),
165-
token: AuthToken::default(),
163+
token: DUMMY_AUTH.get(&*LEADER).expect("should be valid").to_string(),
166164
};
167165
let follower = Validator {
168166
url: ApiUrl::from_str(&format!("{}/follower", server.uri())).expect("should be valid"),
169-
token: AuthToken::default(),
167+
token: DUMMY_AUTH.get(&*FOLLOWER).expect("should be valid").to_string(),
170168
};
171169
validators.insert(DUMMY_VALIDATOR_LEADER.id, leader);
172170
validators.insert(DUMMY_VALIDATOR_FOLLOWER.id, follower);
@@ -180,7 +178,7 @@ mod test {
180178

181179
#[tokio::test]
182180
async fn test_leader_tick() {
183-
let config = configuration(Environment::Development, None).expect("Should get Config");
181+
let config = GANACHE_CONFIG.clone();
184182
let server_setup = ServerSetup::init(&DUMMY_CAMPAIGN.channel).await;
185183
let sentry = setup_sentry(&server_setup.server, &config).await;
186184

@@ -198,10 +196,10 @@ mod test {
198196
.spend(*ADVERTISER, *PUBLISHER_2, UnifiedNum::from_u64(1000))
199197
.expect("should spend");
200198
balances
201-
.spend(*GUARDIAN, *PUBLISHER, UnifiedNum::from_u64(1000))
199+
.spend(*CREATOR, *PUBLISHER, UnifiedNum::from_u64(1000))
202200
.expect("should spend");
203201
balances
204-
.spend(*GUARDIAN, *PUBLISHER_2, UnifiedNum::from_u64(1000))
202+
.spend(*CREATOR, *PUBLISHER_2, UnifiedNum::from_u64(1000))
205203
.expect("should spend");
206204
balances
207205
};

0 commit comments

Comments
 (0)