Skip to content

Commit 93e4379

Browse files
elpielelpiel
committed
validator_worker - remove unnecessary .clone()s
1 parent 0c03489 commit 93e4379

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎validator_worker/src/core/follower_rules.rs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mod test {
6262

6363
#[test]
6464
fn is_valid_transition_a_valid_transition() {
65-
let next = vec![(ADDRESSES["publisher"].clone(), 100.into())]
65+
let next = vec![(ADDRESSES["publisher"], 100.into())]
6666
.into_iter()
6767
.collect();
6868

@@ -75,8 +75,8 @@ mod test {
7575
#[test]
7676
fn is_valid_transition_more_funds_than_dummy_channel() {
7777
let next = vec![
78-
(ADDRESSES["publisher"].clone(), 51.into()),
79-
(ADDRESSES["publisher2"].clone(), 50.into()),
78+
(ADDRESSES["publisher"], 51.into()),
79+
(ADDRESSES["publisher2"], 50.into()),
8080
]
8181
.into_iter()
8282
.collect();
@@ -89,11 +89,11 @@ mod test {
8989

9090
#[test]
9191
fn is_valid_transition_single_value_is_lower() {
92-
let prev = vec![(ADDRESSES["publisher"].clone(), 55.into())]
92+
let prev = vec![(ADDRESSES["publisher"], 55.into())]
9393
.into_iter()
9494
.collect();
9595

96-
let next = vec![(ADDRESSES["publisher"].clone(), 54.into())]
96+
let next = vec![(ADDRESSES["publisher"], 54.into())]
9797
.into_iter()
9898
.collect();
9999

@@ -105,13 +105,13 @@ mod test {
105105

106106
#[test]
107107
fn is_valid_transition_a_value_is_lower_but_overall_sum_is_higher() {
108-
let prev = vec![(ADDRESSES["publisher"].clone(), 55.into())]
108+
let prev = vec![(ADDRESSES["publisher"], 55.into())]
109109
.into_iter()
110110
.collect();
111111

112112
let next = vec![
113-
(ADDRESSES["publisher"].clone(), 54.into()),
114-
(ADDRESSES["publisher2"].clone(), 3.into()),
113+
(ADDRESSES["publisher"], 54.into()),
114+
(ADDRESSES["publisher2"], 3.into()),
115115
]
116116
.into_iter()
117117
.collect();
@@ -125,13 +125,13 @@ mod test {
125125
#[test]
126126
fn is_valid_transition_overall_sum_is_lower() {
127127
let prev = vec![
128-
(ADDRESSES["publisher"].clone(), 54.into()),
129-
(ADDRESSES["publisher2"].clone(), 3.into()),
128+
(ADDRESSES["publisher"], 54.into()),
129+
(ADDRESSES["publisher2"], 3.into()),
130130
]
131131
.into_iter()
132132
.collect();
133133

134-
let next = vec![(ADDRESSES["publisher"].clone(), 54.into())]
134+
let next = vec![(ADDRESSES["publisher"], 54.into())]
135135
.into_iter()
136136
.collect();
137137

@@ -144,13 +144,13 @@ mod test {
144144
#[test]
145145
fn is_valid_transition_overall_sum_is_the_same_but_we_remove_an_entry() {
146146
let prev = vec![
147-
(ADDRESSES["publisher"].clone(), 54.into()),
148-
(ADDRESSES["publisher2"].clone(), 3.into()),
147+
(ADDRESSES["publisher"], 54.into()),
148+
(ADDRESSES["publisher2"], 3.into()),
149149
]
150150
.into_iter()
151151
.collect();
152152

153-
let next = vec![(ADDRESSES["publisher"].clone(), 57.into())]
153+
let next = vec![(ADDRESSES["publisher"], 57.into())]
154154
.into_iter()
155155
.collect();
156156

@@ -163,13 +163,13 @@ mod test {
163163
#[test]
164164
fn is_valid_transition_transition_to_a_state_with_a_negative_number() {
165165
let prev = vec![
166-
(ADDRESSES["publisher"].clone(), 54.into()),
167-
(ADDRESSES["publisher2"].clone(), 3.into()),
166+
(ADDRESSES["publisher"], 54.into()),
167+
(ADDRESSES["publisher2"], 3.into()),
168168
]
169169
.into_iter()
170170
.collect();
171171

172-
let next = vec![(ADDRESSES["publisher"].clone(), 57.into())]
172+
let next = vec![(ADDRESSES["publisher"], 57.into())]
173173
.into_iter()
174174
.collect();
175175

@@ -182,7 +182,7 @@ mod test {
182182
#[test]
183183
fn get_health_the_approved_balance_tree_gte_our_accounting_is_healthy() {
184184
let channel = get_dummy_channel(50);
185-
let our = vec![(ADDRESSES["publisher"].clone(), 50.into())]
185+
let our = vec![(ADDRESSES["publisher"], 50.into())]
186186
.into_iter()
187187
.collect();
188188
assert!(get_health(&channel, &our, &our) >= HEALTH_THRESHOLD);
@@ -191,7 +191,7 @@ mod test {
191191
get_health(
192192
&channel,
193193
&our,
194-
&vec![(ADDRESSES["publisher"].clone(), 60.into())]
194+
&vec![(ADDRESSES["publisher"], 60.into())]
195195
.into_iter()
196196
.collect()
197197
) >= HEALTH_THRESHOLD
@@ -200,7 +200,7 @@ mod test {
200200

201201
#[test]
202202
fn get_health_the_approved_balance_tree_is_positive_our_accounting_is_0_and_it_is_healthy() {
203-
let approved = vec![(ADDRESSES["publisher"].clone(), 50.into())]
203+
let approved = vec![(ADDRESSES["publisher"], 50.into())]
204204
.into_iter()
205205
.collect();
206206

@@ -217,10 +217,10 @@ mod test {
217217
assert!(
218218
get_health(
219219
&channel,
220-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
220+
&vec![(ADDRESSES["publisher"], 80.into())]
221221
.into_iter()
222222
.collect(),
223-
&vec![(ADDRESSES["publisher"].clone(), 79.into())]
223+
&vec![(ADDRESSES["publisher"], 79.into())]
224224
.into_iter()
225225
.collect()
226226
) >= HEALTH_THRESHOLD
@@ -229,10 +229,10 @@ mod test {
229229
assert!(
230230
get_health(
231231
&channel,
232-
&vec![(ADDRESSES["publisher"].clone(), 2.into())]
232+
&vec![(ADDRESSES["publisher"], 2.into())]
233233
.into_iter()
234234
.collect(),
235-
&vec![(ADDRESSES["publisher"].clone(), 1.into())]
235+
&vec![(ADDRESSES["publisher"], 1.into())]
236236
.into_iter()
237237
.collect()
238238
) >= HEALTH_THRESHOLD
@@ -246,10 +246,10 @@ mod test {
246246
assert!(
247247
get_health(
248248
&channel,
249-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
249+
&vec![(ADDRESSES["publisher"], 80.into())]
250250
.into_iter()
251251
.collect(),
252-
&vec![(ADDRESSES["publisher"].clone(), 70.into())]
252+
&vec![(ADDRESSES["publisher"], 70.into())]
253253
.into_iter()
254254
.collect()
255255
) < HEALTH_THRESHOLD
@@ -263,10 +263,10 @@ mod test {
263263
assert!(
264264
get_health(
265265
&channel,
266-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
266+
&vec![(ADDRESSES["publisher"], 80.into())]
267267
.into_iter()
268268
.collect(),
269-
&vec![(ADDRESSES["publisher2"].clone(), 80.into())]
269+
&vec![(ADDRESSES["publisher2"], 80.into())]
270270
.into_iter()
271271
.collect()
272272
) < HEALTH_THRESHOLD
@@ -275,12 +275,12 @@ mod test {
275275
assert!(
276276
get_health(
277277
&channel,
278-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
278+
&vec![(ADDRESSES["publisher"], 80.into())]
279279
.into_iter()
280280
.collect(),
281281
&vec![
282-
(ADDRESSES["publisher2"].clone(), 40.into()),
283-
(ADDRESSES["publisher"].clone(), 40.into())
282+
(ADDRESSES["publisher2"], 40.into()),
283+
(ADDRESSES["publisher"], 40.into())
284284
]
285285
.into_iter()
286286
.collect()
@@ -290,12 +290,12 @@ mod test {
290290
assert!(
291291
get_health(
292292
&channel,
293-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
293+
&vec![(ADDRESSES["publisher"], 80.into())]
294294
.into_iter()
295295
.collect(),
296296
&vec![
297-
(ADDRESSES["publisher2"].clone(), 20.into()),
298-
(ADDRESSES["publisher"].clone(), 60.into())
297+
(ADDRESSES["publisher2"], 20.into()),
298+
(ADDRESSES["publisher"], 60.into())
299299
]
300300
.into_iter()
301301
.collect()
@@ -305,12 +305,12 @@ mod test {
305305
assert!(
306306
get_health(
307307
&channel,
308-
&vec![(ADDRESSES["publisher"].clone(), 80.into())]
308+
&vec![(ADDRESSES["publisher"], 80.into())]
309309
.into_iter()
310310
.collect(),
311311
&vec![
312-
(ADDRESSES["publisher2"].clone(), 2.into()),
313-
(ADDRESSES["publisher"].clone(), 78.into())
312+
(ADDRESSES["publisher2"], 2.into()),
313+
(ADDRESSES["publisher"], 78.into())
314314
]
315315
.into_iter()
316316
.collect()
@@ -321,12 +321,12 @@ mod test {
321321
get_health(
322322
&channel,
323323
&vec![
324-
(ADDRESSES["publisher"].clone(), 100.into()),
325-
(ADDRESSES["publisher2"].clone(), 1.into())
324+
(ADDRESSES["publisher"], 100.into()),
325+
(ADDRESSES["publisher2"], 1.into())
326326
]
327327
.into_iter()
328328
.collect(),
329-
&vec![(ADDRESSES["publisher"].clone(), 100.into())]
329+
&vec![(ADDRESSES["publisher"], 100.into())]
330330
.into_iter()
331331
.collect()
332332
) >= HEALTH_THRESHOLD

‎validator_worker/src/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mod test {
5050

5151
fn setup_iface(channel: &Channel) -> SentryApi<DummyAdapter> {
5252
let adapter_options = DummyAdapterOptions {
53-
dummy_identity: IDS["leader"].clone(),
53+
dummy_identity: IDS["leader"],
5454
dummy_auth: IDS.clone(),
5555
dummy_auth_tokens: AUTH.clone(),
5656
};
@@ -68,8 +68,8 @@ mod test {
6868
let iface = setup_iface(&channel);
6969

7070
let balances: BalancesMap = vec![
71-
(ADDRESSES["publisher"].clone(), 1.into()),
72-
(ADDRESSES["tester"].clone(), 2.into()),
71+
(ADDRESSES["publisher"], 1.into()),
72+
(ADDRESSES["tester"], 2.into()),
7373
]
7474
.into_iter()
7575
.collect();
@@ -89,7 +89,7 @@ mod test {
8989

9090
let iface = setup_iface(&channel);
9191

92-
let balances: BalancesMap = vec![(ADDRESSES["publisher"].clone(), 0.into())]
92+
let balances: BalancesMap = vec![(ADDRESSES["publisher"], 0.into())]
9393
.into_iter()
9494
.collect();
9595

0 commit comments

Comments
 (0)