Skip to content

Commit 5ce8198

Browse files
suchapalaversuchapalaver
committed
refactor: use u256 for values to improve maintainability
Signed-off-by: Joseph Livesey <[email protected]>
1 parent 78ec4ac commit 5ce8198

File tree

22 files changed

+657
-256
lines changed

22 files changed

+657
-256
lines changed

‎tap_aggregator/src/aggregator/v1.rs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,12 @@ fn check_receipt_timestamps(
130130

131131
#[cfg(test)]
132132
mod tests {
133-
use std::str::FromStr;
134-
135133
use rstest::*;
136134
use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
137135
use tap_graph::{Receipt, ReceiptAggregateVoucher};
138136
use thegraph_core::alloy::{
139137
dyn_abi::Eip712Domain,
140-
primitives::{Address, U256},
138+
primitives::{address, Address, U256},
141139
signers::{local::PrivateKeySigner, Signature},
142140
};
143141

@@ -153,10 +151,10 @@ mod tests {
153151
#[fixture]
154152
fn allocation_ids() -> Vec<Address> {
155153
vec![
156-
Address::from_str("0xabababababababababababababababababababab").unwrap(),
157-
Address::from_str("0xdeaddeaddeaddeaddeaddeaddeaddeaddeaddead").unwrap(),
158-
Address::from_str("0xbeefbeefbeefbeefbeefbeefbeefbeefbeefbeef").unwrap(),
159-
Address::from_str("0x1234567890abcdef1234567890abcdef12345678").unwrap(),
154+
address!("0xabababababababababababababababababababab"),
155+
address!("0xdeaddeaddeaddeaddeaddeaddeaddeaddeaddead"),
156+
address!("0xbeefbeefbeefbeefbeefbeefbeefbeefbeefbeef"),
157+
address!("0x1234567890abcdef1234567890abcdef12345678"),
160158
]
161159
}
162160

@@ -175,7 +173,7 @@ mod tests {
175173
// Create a test receipt
176174
let receipt = Eip712SignedMessage::new(
177175
&domain_separator,
178-
Receipt::new(allocation_ids[0], 42).unwrap(),
176+
Receipt::new(allocation_ids[0], U256::from(42)).unwrap(),
179177
&keys.0,
180178
)
181179
.unwrap();
@@ -236,7 +234,7 @@ mod tests {
236234
let mut receipts = Vec::new();
237235
let receipt = Eip712SignedMessage::new(
238236
&domain_separator,
239-
Receipt::new(allocation_ids[0], 42).unwrap(),
237+
Receipt::new(allocation_ids[0], U256::from(42)).unwrap(),
240238
&keys.0,
241239
)
242240
.unwrap();
@@ -258,13 +256,13 @@ mod tests {
258256
let receipts = vec![
259257
Eip712SignedMessage::new(
260258
&domain_separator,
261-
Receipt::new(allocation_ids[0], 42).unwrap(),
259+
Receipt::new(allocation_ids[0], U256::from(42)).unwrap(),
262260
&keys.0,
263261
)
264262
.unwrap(),
265263
Eip712SignedMessage::new(
266264
&domain_separator,
267-
Receipt::new(allocation_ids[0], 43).unwrap(),
265+
Receipt::new(allocation_ids[0], U256::from(43)).unwrap(),
268266
&keys.0,
269267
)
270268
.unwrap(),
@@ -293,7 +291,7 @@ mod tests {
293291
allocation_id: allocation_ids[0],
294292
timestamp_ns: i,
295293
nonce: 0,
296-
value: 42,
294+
value: U256::from(42),
297295
},
298296
&keys.0,
299297
)
@@ -307,7 +305,7 @@ mod tests {
307305
ReceiptAggregateVoucher {
308306
allocationId: allocation_ids[0],
309307
timestampNs: receipt_timestamp_range.clone().min().unwrap() - 1,
310-
valueAggregate: 42,
308+
valueAggregate: U256::from(42),
311309
},
312310
&keys.0,
313311
)
@@ -321,7 +319,7 @@ mod tests {
321319
ReceiptAggregateVoucher {
322320
allocationId: allocation_ids[0],
323321
timestampNs: receipt_timestamp_range.clone().min().unwrap(),
324-
valueAggregate: 42,
322+
valueAggregate: U256::from(42),
325323
},
326324
&keys.0,
327325
)
@@ -335,7 +333,7 @@ mod tests {
335333
ReceiptAggregateVoucher {
336334
allocationId: allocation_ids[0],
337335
timestampNs: receipt_timestamp_range.clone().max().unwrap() + 1,
338-
valueAggregate: 42,
336+
valueAggregate: U256::from(42),
339337
},
340338
&keys.0,
341339
)
@@ -355,19 +353,19 @@ mod tests {
355353
let receipts = vec![
356354
Eip712SignedMessage::new(
357355
&domain_separator,
358-
Receipt::new(allocation_ids[0], 42).unwrap(),
356+
Receipt::new(allocation_ids[0], U256::from(42)).unwrap(),
359357
&keys.0,
360358
)
361359
.unwrap(),
362360
Eip712SignedMessage::new(
363361
&domain_separator,
364-
Receipt::new(allocation_ids[0], 43).unwrap(),
362+
Receipt::new(allocation_ids[0], U256::from(43)).unwrap(),
365363
&keys.0,
366364
)
367365
.unwrap(),
368366
Eip712SignedMessage::new(
369367
&domain_separator,
370-
Receipt::new(allocation_ids[1], 44).unwrap(),
368+
Receipt::new(allocation_ids[1], U256::from(44)).unwrap(),
371369
&keys.0,
372370
)
373371
.unwrap(),
@@ -389,19 +387,19 @@ mod tests {
389387
let receipts = vec![
390388
Eip712SignedMessage::new(
391389
&domain_separator,
392-
Receipt::new(allocation_ids[0], 42).unwrap(),
390+
Receipt::new(allocation_ids[0], U256::from(42)).unwrap(),
393391
&keys.0,
394392
)
395393
.unwrap(),
396394
Eip712SignedMessage::new(
397395
&domain_separator,
398-
Receipt::new(allocation_ids[0], 43).unwrap(),
396+
Receipt::new(allocation_ids[0], U256::from(43)).unwrap(),
399397
&keys.0,
400398
)
401399
.unwrap(),
402400
Eip712SignedMessage::new(
403401
&domain_separator,
404-
Receipt::new(allocation_ids[0], 44).unwrap(),
402+
Receipt::new(allocation_ids[0], U256::from(44)).unwrap(),
405403
&keys.0,
406404
)
407405
.unwrap(),

‎tap_aggregator/src/aggregator/v2.rs‎

Lines changed: 77 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ mod tests {
190190
use tap_graph::v2::{Receipt, ReceiptAggregateVoucher};
191191
use thegraph_core::alloy::{
192192
dyn_abi::Eip712Domain,
193-
primitives::{address, Address, Bytes},
193+
primitives::{address, Address, Bytes, U256},
194194
signers::local::PrivateKeySigner,
195195
};
196196

@@ -244,7 +244,14 @@ mod tests {
244244
let mut receipts = Vec::new();
245245
let receipt = Eip712SignedMessage::new(
246246
&domain_separator,
247-
Receipt::new(allocation_id, payer, data_service, service_provider, 42).unwrap(),
247+
Receipt::new(
248+
allocation_id,
249+
payer,
250+
data_service,
251+
service_provider,
252+
U256::from(42),
253+
)
254+
.unwrap(),
248255
&keys.0,
249256
)
250257
.unwrap();
@@ -269,13 +276,27 @@ mod tests {
269276
let receipts = vec![
270277
Eip712SignedMessage::new(
271278
&domain_separator,
272-
Receipt::new(allocation_id, payer, data_service, service_provider, 42).unwrap(),
279+
Receipt::new(
280+
allocation_id,
281+
payer,
282+
data_service,
283+
service_provider,
284+
U256::from(42),
285+
)
286+
.unwrap(),
273287
&keys.0,
274288
)
275289
.unwrap(),
276290
Eip712SignedMessage::new(
277291
&domain_separator,
278-
Receipt::new(allocation_id, payer, data_service, service_provider, 42).unwrap(),
292+
Receipt::new(
293+
allocation_id,
294+
payer,
295+
data_service,
296+
service_provider,
297+
U256::from(42),
298+
)
299+
.unwrap(),
279300
&keys.0,
280301
)
281302
.unwrap(),
@@ -310,7 +331,7 @@ mod tests {
310331
service_provider,
311332
timestamp_ns: i,
312333
nonce: 0,
313-
value: 42,
334+
value: U256::from(42),
314335
},
315336
&keys.0,
316337
)
@@ -327,7 +348,7 @@ mod tests {
327348
payer,
328349
serviceProvider: service_provider,
329350
timestampNs: receipt_timestamp_range.clone().min().unwrap() - 1,
330-
valueAggregate: 42,
351+
valueAggregate: U256::from(42),
331352
metadata: Bytes::new(),
332353
},
333354
&keys.0,
@@ -345,7 +366,7 @@ mod tests {
345366
payer,
346367
serviceProvider: service_provider,
347368
timestampNs: receipt_timestamp_range.clone().min().unwrap(),
348-
valueAggregate: 42,
369+
valueAggregate: U256::from(42),
349370
metadata: Bytes::new(),
350371
},
351372
&keys.0,
@@ -363,7 +384,7 @@ mod tests {
363384
payer,
364385
serviceProvider: service_provider,
365386
timestampNs: receipt_timestamp_range.clone().max().unwrap() + 1,
366-
valueAggregate: 42,
387+
valueAggregate: U256::from(42),
367388
metadata: Bytes::new(),
368389
},
369390
&keys.0,
@@ -388,19 +409,40 @@ mod tests {
388409
let receipts = vec![
389410
Eip712SignedMessage::new(
390411
&domain_separator,
391-
Receipt::new(allocation_id, payer, data_service, service_provider, 42).unwrap(),
412+
Receipt::new(
413+
allocation_id,
414+
payer,
415+
data_service,
416+
service_provider,
417+
U256::from(42),
418+
)
419+
.unwrap(),
392420
&keys.0,
393421
)
394422
.unwrap(),
395423
Eip712SignedMessage::new(
396424
&domain_separator,
397-
Receipt::new(allocation_id, payer, data_service, service_provider, 43).unwrap(),
425+
Receipt::new(
426+
allocation_id,
427+
payer,
428+
data_service,
429+
service_provider,
430+
U256::from(43),
431+
)
432+
.unwrap(),
398433
&keys.0,
399434
)
400435
.unwrap(),
401436
Eip712SignedMessage::new(
402437
&domain_separator,
403-
Receipt::new(other_address, payer, data_service, service_provider, 44).unwrap(),
438+
Receipt::new(
439+
other_address,
440+
payer,
441+
data_service,
442+
service_provider,
443+
U256::from(44),
444+
)
445+
.unwrap(),
404446
&keys.0,
405447
)
406448
.unwrap(),
@@ -431,19 +473,40 @@ mod tests {
431473
let receipts = vec![
432474
Eip712SignedMessage::new(
433475
&domain_separator,
434-
Receipt::new(allocation_id, payer, data_service, service_provider, 42).unwrap(),
476+
Receipt::new(
477+
allocation_id,
478+
payer,
479+
data_service,
480+
service_provider,
481+
U256::from(42),
482+
)
483+
.unwrap(),
435484
&keys.0,
436485
)
437486
.unwrap(),
438487
Eip712SignedMessage::new(
439488
&domain_separator,
440-
Receipt::new(allocation_id, payer, data_service, service_provider, 43).unwrap(),
489+
Receipt::new(
490+
allocation_id,
491+
payer,
492+
data_service,
493+
service_provider,
494+
U256::from(43),
495+
)
496+
.unwrap(),
441497
&keys.0,
442498
)
443499
.unwrap(),
444500
Eip712SignedMessage::new(
445501
&domain_separator,
446-
Receipt::new(allocation_id, payer, data_service, service_provider, 44).unwrap(),
502+
Receipt::new(
503+
allocation_id,
504+
payer,
505+
data_service,
506+
service_provider,
507+
U256::from(44),
508+
)
509+
.unwrap(),
447510
&keys.0,
448511
)
449512
.unwrap(),

0 commit comments

Comments
 (0)