Skip to content

Commit e326ea8

Browse files
committed
Port to new region system
1 parent 2eb1b92 commit e326ea8

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

packages/std/src/imports.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,11 @@ impl Api for ExternalApi {
396396
fn bls12_381_aggregate_g1(&self, g1s: &[u8]) -> Result<[u8; 48], VerificationError> {
397397
let point = [0_u8; 48];
398398

399-
let send = build_region(g1s);
400-
let send_ptr = &*send as *const Region as u32;
399+
let send = Region::from_slice(g1s);
400+
let send_ptr = send.as_ptr() as u32;
401401

402-
let out = build_region(&point[..]);
403-
let out_ptr = &*out as *const Region as u32;
402+
let out = Region::from_slice(&point);
403+
let out_ptr = out.as_ptr() as u32;
404404
let result = unsafe { bls12_381_aggregate_g1(send_ptr, out_ptr) };
405405
match result {
406406
0 => Ok(point),
@@ -419,11 +419,11 @@ impl Api for ExternalApi {
419419
fn bls12_381_aggregate_g2(&self, g2s: &[u8]) -> Result<[u8; 96], VerificationError> {
420420
let point = [0_u8; 96];
421421

422-
let send = build_region(g2s);
423-
let send_ptr = &*send as *const Region as u32;
422+
let send = Region::from_slice(g2s);
423+
let send_ptr = send.as_ptr() as u32;
424424

425-
let out = build_region(&point[..]);
426-
let out_ptr = &*out as *const Region as u32;
425+
let out = Region::from_slice(&point);
426+
let out_ptr = out.as_ptr() as u32;
427427
let result = unsafe { bls12_381_aggregate_g2(send_ptr, out_ptr) };
428428
match result {
429429
0 => Ok(point),
@@ -446,15 +446,15 @@ impl Api for ExternalApi {
446446
r: &[u8],
447447
s: &[u8],
448448
) -> Result<bool, VerificationError> {
449-
let send_ps = build_region(ps);
450-
let send_qs = build_region(qs);
451-
let send_r = build_region(r);
452-
let send_s = build_region(s);
449+
let send_ps = Region::from_slice(ps);
450+
let send_qs = Region::from_slice(qs);
451+
let send_r = Region::from_slice(r);
452+
let send_s = Region::from_slice(s);
453453

454-
let send_ps_ptr = &*send_ps as *const Region as u32;
455-
let send_qs_ptr = &*send_qs as *const Region as u32;
456-
let send_r_ptr = &*send_r as *const Region as u32;
457-
let send_s_ptr = &*send_s as *const Region as u32;
454+
let send_ps_ptr = send_ps.as_ptr() as u32;
455+
let send_qs_ptr = send_qs.as_ptr() as u32;
456+
let send_r_ptr = send_r.as_ptr() as u32;
457+
let send_s_ptr = send_s.as_ptr() as u32;
458458

459459
let result =
460460
unsafe { bls12_381_pairing_equality(send_ps_ptr, send_qs_ptr, send_r_ptr, send_s_ptr) };
@@ -484,14 +484,14 @@ impl Api for ExternalApi {
484484
) -> Result<[u8; 48], VerificationError> {
485485
let point = [0_u8; 48];
486486

487-
let send_msg = build_region(msg);
488-
let send_msg_ptr = &*send_msg as *const Region as u32;
487+
let send_msg = Region::from_slice(msg);
488+
let send_msg_ptr = send_msg.as_ptr() as u32;
489489

490-
let send_dst = build_region(dst);
491-
let send_dst_ptr = &*send_dst as *const Region as u32;
490+
let send_dst = Region::from_slice(dst);
491+
let send_dst_ptr = send_dst.as_ptr() as u32;
492492

493-
let out = build_region(&point[..]);
494-
let out_ptr = &*out as *const Region as u32;
493+
let out = Region::from_slice(&point);
494+
let out_ptr = out.as_ptr() as u32;
495495
let result = unsafe {
496496
bls12_381_hash_to_g1(hash_function as u32, send_msg_ptr, send_dst_ptr, out_ptr)
497497
};
@@ -512,14 +512,14 @@ impl Api for ExternalApi {
512512
) -> Result<[u8; 96], VerificationError> {
513513
let point = [0_u8; 96];
514514

515-
let send_msg = build_region(msg);
516-
let send_msg_ptr = &*send_msg as *const Region as u32;
515+
let send_msg = Region::from_slice(msg);
516+
let send_msg_ptr = send_msg.as_ptr() as u32;
517517

518-
let send_dst = build_region(dst);
519-
let send_dst_ptr = &*send_dst as *const Region as u32;
518+
let send_dst = Region::from_slice(dst);
519+
let send_dst_ptr = send_dst.as_ptr() as u32;
520520

521-
let out = build_region(&point[..]);
522-
let out_ptr = &*out as *const Region as u32;
521+
let out = Region::from_slice(&point);
522+
let out_ptr = out.as_ptr() as u32;
523523
let result = unsafe {
524524
bls12_381_hash_to_g2(hash_function as u32, send_msg_ptr, send_dst_ptr, out_ptr)
525525
};

0 commit comments

Comments
 (0)