Skip to content

Commit 74153ce

Browse files
authored
Merge of #1956
2 parents 362930d + b7e0195 commit 74153ce

File tree

22 files changed

+46
-39
lines changed

22 files changed

+46
-39
lines changed

coprocessor/fhevm-engine/fhevm-engine-common/src/gpu_memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn release_memory_on_gpu(amount: u64, idx: usize) {
8585
pub fn get_op_size_on_gpu(
8686
fhe_operation_int: i16,
8787
input_operands: &[SupportedFheCiphertexts],
88-
// for deterministc randomness functions
88+
// for deterministic randomness functions
8989
) -> Result<u64, FhevmError> {
9090
let fhe_operation: SupportedFheOperations =
9191
fhe_operation_int.try_into().expect("Invalid operation");

coprocessor/fhevm-engine/fhevm-engine-common/src/tfhe_ops.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn trivial_encrypt_be_bytes(output_type: i16, input_bytes: &[u8]) -> Support
8383
};
8484
match output_type {
8585
0 => SupportedFheCiphertexts::FheBool(
86-
FheBool::try_encrypt_trivial(last_byte > 0).expect("trival encrypt bool"),
86+
FheBool::try_encrypt_trivial(last_byte > 0).expect("trivial encrypt bool"),
8787
),
8888
1 => SupportedFheCiphertexts::FheUint4(
8989
FheUint4::try_encrypt_trivial(last_byte).expect("trivial encrypt 4"),
@@ -740,7 +740,7 @@ pub fn perform_fhe_operation(
740740
fhe_operation_int: i16,
741741
input_operands: &[SupportedFheCiphertexts],
742742
_: usize,
743-
// for deterministc randomness functions
743+
// for deterministic randomness functions
744744
) -> Result<SupportedFheCiphertexts, FhevmError> {
745745
perform_fhe_operation_impl(fhe_operation_int, input_operands)
746746
}
@@ -750,7 +750,7 @@ pub fn perform_fhe_operation(
750750
fhe_operation_int: i16,
751751
input_operands: &[SupportedFheCiphertexts],
752752
gpu_idx: usize,
753-
// for deterministc randomness functions
753+
// for deterministic randomness functions
754754
) -> Result<SupportedFheCiphertexts, FhevmError> {
755755
use crate::gpu_memory::{get_op_size_on_gpu, release_memory_on_gpu, reserve_memory_on_gpu};
756756

@@ -767,7 +767,7 @@ pub fn perform_fhe_operation(
767767
pub fn perform_fhe_operation_impl(
768768
fhe_operation_int: i16,
769769
input_operands: &[SupportedFheCiphertexts],
770-
// for deterministc randomness functions
770+
// for deterministic randomness functions
771771
) -> Result<SupportedFheCiphertexts, FhevmError> {
772772
let fhe_operation: SupportedFheOperations = fhe_operation_int.try_into()?;
773773
match fhe_operation {

coprocessor/fhevm-engine/fhevm-engine-common/src/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ impl SupportedFheCiphertexts {
611611
}
612612

613613
// Decompress without checking if enough GPU memory is available -
614-
// used when GPU featre is active, but decompressing on CPU
614+
// used when GPU feature is active, but decompressing on CPU
615615
pub fn decompress_no_memcheck(ct_type: i16, list: &[u8]) -> Result<Self> {
616616
let ctlist: CompressedCiphertextList = safe_deserialize(list)?;
617617
Self::decompress_impl(ct_type, &ctlist)

coprocessor/fhevm-engine/gw-listener/src/sks_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub fn extract_server_key_without_ns(sns_key: &[u8]) -> anyhow::Result<Vec<u8>>
2626
anyhow::bail!("Server key does not have noise squashing");
2727
}
2828
if noise_squashing_compression_key.is_none() {
29-
anyhow::bail!("Server key does not have noise squashing compresion");
29+
anyhow::bail!("Server key does not have noise squashing compression");
3030
}
3131
if re_randomization_keyswitching_key.is_none() {
3232
anyhow::bail!("Server key does not have rerandomisation");

coprocessor/fhevm-engine/host-listener/src/cmd/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ impl InfiniteLogIter {
656656
))
657657
}
658658

659-
async fn get_missings_ancestors(
659+
async fn get_missing_ancestors(
660660
&self,
661661
mut current_block: BlockSummary,
662662
) -> Vec<BlockSummary> {
@@ -730,7 +730,7 @@ impl InfiniteLogIter {
730730
}
731731

732732
let missing_blocks =
733-
self.get_missings_ancestors(current_block_summary).await;
733+
self.get_missing_ancestors(current_block_summary).await;
734734
if missing_blocks.is_empty() {
735735
// we don't add to history from which we have no event
736736
// e.g. at timeout, because empty blocks are not get_logs
@@ -762,7 +762,7 @@ impl InfiniteLogIter {
762762
// note subscribing to real-time before reading catchup
763763
// events to have the minimal gap between the two
764764
// TODO: but it does not guarantee no gap for now
765-
// (implementation dependant)
765+
// (implementation dependent)
766766
// subscribe_logs does not honor from_block and sometime not to_block
767767
// so we rely on catchup_blocks and end_at_block_reached
768768
self.stream = Some(provider.subscribe_blocks().await?.into_stream());
@@ -784,7 +784,7 @@ impl InfiniteLogIter {
784784
};
785785
let next_opt_event = stream.next();
786786
// it assume the eventual discard of next_opt_event is handled correctly
787-
// by alloy if not the case, the recheck mecanism ensures it's
787+
// by alloy if not the case, the recheck mechanism ensures it's
788788
// only extra latency
789789
match tokio::time::timeout(
790790
Duration::from_secs(self.block_time + 2),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl Transaction {
3333
allowed_handle: Vec::with_capacity(5),
3434
input_tx: HashSet::with_capacity(3),
3535
output_tx: HashSet::with_capacity(3),
36-
linear_chain: tx_hash, // before coallescing linear tx chains
36+
linear_chain: tx_hash, // before coalescing linear tx chains
3737
size: 0,
3838
depth_size: 0,
3939
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ impl Database {
684684
block_number: u64,
685685
transaction_id: Option<Vec<u8>>,
686686
) -> Result<bool, SqlxError> {
687-
// ON CONFLIT is done on Unique constraint
687+
// ON CONFLICT is done on Unique constraint
688688
let query = sqlx::query!(
689689
"INSERT INTO delegate_user_decrypt(
690690
delegator, delegate, contract_address, delegation_counter, old_expiration_date, new_expiration_date, host_chain_id, block_number, block_hash, transaction_id, on_gateway, reorg_out)

coprocessor/fhevm-engine/host-listener/tests/host_listener_integration_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ async fn test_listener_no_event_loss(
349349
let mut acl_events_count = 0;
350350
let mut nb_kill = 1;
351351
let nb_wallets = setup.wallets.len() as i64;
352-
// Restart/kill many time until no more events are consumned.
352+
// Restart/kill many time until no more events are consumed.
353353
for _ in 1..120 {
354354
// 10 mins max to avoid stalled CI
355355
let listener_handle = tokio::spawn(main(args.clone()));

coprocessor/fhevm-engine/scheduler/src/dfg.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ impl DFGraph {
687687
}
688688
}
689689

690-
pub fn add_execution_depedences<TNode, TEdge>(
690+
pub fn add_execution_dependences<TNode, TEdge>(
691691
graph: &Dag<TNode, TEdge>,
692692
execution_graph: &mut Dag<ExecNode, ()>,
693693
node_map: HashMap<NodeIndex, NodeIndex>,
@@ -759,7 +759,7 @@ pub fn partition_preserving_parallelism<TNode, TEdge>(
759759
execution_graph[ex_node].df_nodes = df_nodes;
760760
}
761761
}
762-
add_execution_depedences(graph, execution_graph, node_map)
762+
add_execution_dependences(graph, execution_graph, node_map)
763763
}
764764

765765
pub fn partition_components<TNode, TEdge>(

coprocessor/fhevm-engine/tfhe-worker/src/dependence_chain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ impl LockMngr {
334334
}
335335
};
336336

337-
// Since UPDATE always aquire a row-level lock internally,
337+
// Since UPDATE always acquire a row-level lock internally,
338338
// this acts as atomic_exchange
339339
let rows = if let Some(update_at) = update_at {
340340
sqlx::query!(

0 commit comments

Comments
 (0)