Skip to content

Commit 44df2ab

Browse files
rudy-6-4rudy-6-4
committed
fix(coprocessor): fix to squash, cargo fmt
1 parent b32cba1 commit 44df2ab

File tree

2 files changed

+156
-31
lines changed

2 files changed

+156
-31
lines changed

‎coprocessor/fhevm-engine/host-listener/src/database/dependence_chains.rs‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,34 @@ mod tests {
363363
fn new_handle() -> Handle {
364364
static HANDLE_COUNTER: std::sync::atomic::AtomicU64 =
365365
std::sync::atomic::AtomicU64::new(1);
366-
let id =
367-
HANDLE_COUNTER.fetch_add(10000, std::sync::atomic::Ordering::SeqCst);
366+
let id = HANDLE_COUNTER
367+
.fetch_add(10000, std::sync::atomic::Ordering::SeqCst);
368368
Handle::from_slice(&[
369369
// 32 bytes
370-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
371-
0, 0, 0, 0, 0, 0, 0, 0,
370+
0,
371+
0,
372+
0,
373+
0,
374+
0,
375+
0,
376+
0,
377+
0,
378+
0,
379+
0,
380+
0,
381+
0,
382+
0,
383+
0,
384+
0,
385+
0,
386+
0,
387+
0,
388+
0,
389+
0,
390+
0,
391+
0,
392+
0,
393+
0,
372394
(id >> 56) as u8,
373395
(id >> 48) as u8,
374396
(id >> 40) as u8,
@@ -669,7 +691,6 @@ mod tests {
669691
assert_eq!(cache.read().await.len(), 2);
670692
}
671693

672-
673694
#[tokio::test]
674695
async fn test_dependence_chains_duplicated_trivial_encrypt() {
675696
let cache = ChainCache::new(lru::LruCache::new(
@@ -681,7 +702,7 @@ mod tests {
681702
let va_1 = input_handle(&mut logs, tx1);
682703
let vb_1 = op1(va_1, &mut logs, tx1);
683704
let va_2 = input_shared_handle(&mut logs, va_1, tx2);
684-
let vb_2 = op2(vb_1,va_2, &mut logs, tx2);
705+
let vb_2 = op2(vb_1, va_2, &mut logs, tx2);
685706
let chains = dependence_chains(&mut logs, &cache).await;
686707
assert_eq!(chains.len(), 1);
687708
}
@@ -716,19 +737,23 @@ mod tests {
716737
for tx_id in 0..1 {
717738
for chain in 1..=6 {
718739
let tx_hash =
719-
TransactionHash::with_last_byte(chain * 10 + tx_id);
740+
TransactionHash::with_last_byte(chain * 10 + tx_id);
720741
if tx_id == 0 {
721742
let past_chain = past_chain(chain);
722743
let past_chain_hash = past_chain.hash;
723744
cache.write().await.put(
724745
Handle::with_last_byte(100 + chain as u8),
725746
past_chain_hash,
726747
);
727-
past_handles.push((Handle::with_last_byte(100 + chain as u8), input_handle(&mut logs, tx_hash)));
748+
past_handles.push((
749+
Handle::with_last_byte(100 + chain as u8),
750+
input_handle(&mut logs, tx_hash),
751+
));
728752
}
729753
let (v0_a, v0_b) = past_handles[chain as usize - 1];
730-
let v0 = input_handle(&mut logs, tx_hash);
731-
let v0_bis = input_shared_handle(&mut logs, shared_handle, tx_hash);
754+
let v0 = input_handle(&mut logs, tx_hash);
755+
let v0_bis =
756+
input_shared_handle(&mut logs, shared_handle, tx_hash);
732757
let v0 = op2(v0, v0_bis, &mut logs, tx_hash);
733758
let v1 = op2(v0_a, v0, &mut logs, tx_hash);
734759
let v2 = op2(v0_b, v0_a, &mut logs, tx_hash);
@@ -742,5 +767,4 @@ mod tests {
742767
assert_eq!(chains.len(), 6);
743768
// assert_eq!(cache.read().await.len(), 66);
744769
}
745-
746770
}

‎coprocessor/fhevm-engine/host-listener/src/database/tfhe_event_propagate.rs‎

Lines changed: 121 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -922,31 +922,132 @@ pub fn tfhe_inputs_handle(op: &TfheContractEvents) -> Vec<Handle> {
922922
| E::FheNeg(C::FheNeg { ct, .. })
923923
| E::FheNot(C::FheNot { ct, .. }) => vec![*ct],
924924

925-
E::FheAdd(C::FheAdd { lhs, rhs, scalarByte, ..})
926-
| E::FheBitAnd(C::FheBitAnd { lhs, rhs, scalarByte, .. })
927-
| E::FheBitOr(C::FheBitOr { lhs, rhs, scalarByte, .. })
928-
| E::FheBitXor(C::FheBitXor { lhs, rhs, scalarByte, .. })
929-
| E::FheDiv(C::FheDiv { lhs, rhs, scalarByte, ..})
930-
| E::FheMax(C::FheMax { lhs, rhs, scalarByte, ..})
931-
| E::FheMin(C::FheMin { lhs, rhs, scalarByte, .. })
932-
| E::FheMul(C::FheMul { lhs, rhs, scalarByte, .. })
933-
| E::FheRem(C::FheRem { lhs, rhs, scalarByte, .. })
934-
| E::FheRotl(C::FheRotl { lhs, rhs, scalarByte, .. })
935-
| E::FheRotr(C::FheRotr { lhs, rhs, scalarByte, .. })
936-
| E::FheShl(C::FheShl { lhs, rhs, scalarByte, .. })
937-
| E::FheShr(C::FheShr { lhs, rhs, scalarByte, .. })
938-
| E::FheSub(C::FheSub { lhs, rhs, scalarByte, .. })
939-
| E::FheEq(C::FheEq { lhs, rhs, scalarByte, .. })
940-
| E::FheGe(C::FheGe { lhs, rhs, scalarByte, .. })
941-
| E::FheGt(C::FheGt { lhs, rhs, scalarByte, .. })
942-
| E::FheLe(C::FheLe { lhs, rhs, scalarByte, .. })
943-
| E::FheLt(C::FheLt { lhs, rhs, scalarByte, .. })
944-
| E::FheNe(C::FheNe { lhs, rhs, scalarByte, .. }) =>
925+
E::FheAdd(C::FheAdd {
926+
lhs,
927+
rhs,
928+
scalarByte,
929+
..
930+
})
931+
| E::FheBitAnd(C::FheBitAnd {
932+
lhs,
933+
rhs,
934+
scalarByte,
935+
..
936+
})
937+
| E::FheBitOr(C::FheBitOr {
938+
lhs,
939+
rhs,
940+
scalarByte,
941+
..
942+
})
943+
| E::FheBitXor(C::FheBitXor {
944+
lhs,
945+
rhs,
946+
scalarByte,
947+
..
948+
})
949+
| E::FheDiv(C::FheDiv {
950+
lhs,
951+
rhs,
952+
scalarByte,
953+
..
954+
})
955+
| E::FheMax(C::FheMax {
956+
lhs,
957+
rhs,
958+
scalarByte,
959+
..
960+
})
961+
| E::FheMin(C::FheMin {
962+
lhs,
963+
rhs,
964+
scalarByte,
965+
..
966+
})
967+
| E::FheMul(C::FheMul {
968+
lhs,
969+
rhs,
970+
scalarByte,
971+
..
972+
})
973+
| E::FheRem(C::FheRem {
974+
lhs,
975+
rhs,
976+
scalarByte,
977+
..
978+
})
979+
| E::FheRotl(C::FheRotl {
980+
lhs,
981+
rhs,
982+
scalarByte,
983+
..
984+
})
985+
| E::FheRotr(C::FheRotr {
986+
lhs,
987+
rhs,
988+
scalarByte,
989+
..
990+
})
991+
| E::FheShl(C::FheShl {
992+
lhs,
993+
rhs,
994+
scalarByte,
995+
..
996+
})
997+
| E::FheShr(C::FheShr {
998+
lhs,
999+
rhs,
1000+
scalarByte,
1001+
..
1002+
})
1003+
| E::FheSub(C::FheSub {
1004+
lhs,
1005+
rhs,
1006+
scalarByte,
1007+
..
1008+
})
1009+
| E::FheEq(C::FheEq {
1010+
lhs,
1011+
rhs,
1012+
scalarByte,
1013+
..
1014+
})
1015+
| E::FheGe(C::FheGe {
1016+
lhs,
1017+
rhs,
1018+
scalarByte,
1019+
..
1020+
})
1021+
| E::FheGt(C::FheGt {
1022+
lhs,
1023+
rhs,
1024+
scalarByte,
1025+
..
1026+
})
1027+
| E::FheLe(C::FheLe {
1028+
lhs,
1029+
rhs,
1030+
scalarByte,
1031+
..
1032+
})
1033+
| E::FheLt(C::FheLt {
1034+
lhs,
1035+
rhs,
1036+
scalarByte,
1037+
..
1038+
})
1039+
| E::FheNe(C::FheNe {
1040+
lhs,
1041+
rhs,
1042+
scalarByte,
1043+
..
1044+
}) => {
9451045
if scalarByte.const_is_zero() {
9461046
vec![*lhs, *rhs]
9471047
} else {
9481048
vec![*lhs]
9491049
}
1050+
}
9501051

9511052
E::FheIfThenElse(C::FheIfThenElse {
9521053
control,

0 commit comments

Comments
 (0)