Skip to content

Commit 90f7c20

Browse files
committed
style: naming & comments adjustements from pr reviews
1 parent ad4d1db commit 90f7c20

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

mithril-aggregator/src/database/query/buffered_single_signature/delete_buffered_single_signature.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub struct DeleteBufferedSingleSignatureQuery {
1212

1313
impl DeleteBufferedSingleSignatureQuery {
1414
pub fn by_discriminant_and_party_ids(
15-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
15+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
1616
party_ids: Vec<PartyId>,
1717
) -> Self {
1818
let ids_values = party_ids.into_iter().map(Value::String).collect();
@@ -21,7 +21,7 @@ impl DeleteBufferedSingleSignatureQuery {
2121
condition: WhereCondition::new(
2222
"signed_entity_type_id = ?*",
2323
vec![Value::Integer(
24-
signed_entity_type_discriminants.index() as i64
24+
signed_entity_type_discriminant.index() as i64
2525
)],
2626
)
2727
.and_where(WhereCondition::where_in("party_id", ids_values)),

mithril-aggregator/src/database/query/buffered_single_signature/get_buffered_single_signature.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ impl GetBufferedSingleSignatureQuery {
1818
}
1919
}
2020

21-
pub fn by_discriminant(
22-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
23-
) -> Self {
21+
pub fn by_discriminant(signed_entity_type_discriminant: SignedEntityTypeDiscriminants) -> Self {
2422
Self {
2523
condition: WhereCondition::new(
2624
"signed_entity_type_id = ?*",
2725
vec![Value::Integer(
28-
signed_entity_type_discriminants.index() as i64
26+
signed_entity_type_discriminant.index() as i64
2927
)],
3028
),
3129
}

mithril-aggregator/src/database/repository/buffered_single_signature_repository.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl BufferedSingleSignatureRepository {
3434

3535
fn get_by_discriminant<T>(
3636
&self,
37-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
37+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
3838
) -> StdResult<Vec<T>>
3939
where
4040
T: TryFrom<BufferedSingleSignatureRecord>,
@@ -43,7 +43,7 @@ impl BufferedSingleSignatureRepository {
4343
let records: Vec<BufferedSingleSignatureRecord> =
4444
self.connection
4545
.fetch_collect(GetBufferedSingleSignatureQuery::by_discriminant(
46-
signed_entity_type_discriminants,
46+
signed_entity_type_discriminant,
4747
))?;
4848

4949
let mut entities: Vec<T> = Vec::with_capacity(records.len());
@@ -59,12 +59,12 @@ impl BufferedSingleSignatureRepository {
5959
impl BufferedSingleSignatureStore for BufferedSingleSignatureRepository {
6060
async fn buffer_signature(
6161
&self,
62-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
62+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
6363
signature: &SingleSignatures,
6464
) -> StdResult<()> {
6565
let record = BufferedSingleSignatureRecord::try_from_single_signatures(
6666
signature,
67-
signed_entity_type_discriminants,
67+
signed_entity_type_discriminant,
6868
)
6969
.with_context(|| "Failed to convert SingleSignatures to BufferedSingleSignatureRecord")?;
7070

@@ -78,20 +78,20 @@ impl BufferedSingleSignatureStore for BufferedSingleSignatureRepository {
7878

7979
async fn get_buffered_signatures(
8080
&self,
81-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
81+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
8282
) -> StdResult<Vec<SingleSignatures>> {
83-
self.get_by_discriminant(signed_entity_type_discriminants)
83+
self.get_by_discriminant(signed_entity_type_discriminant)
8484
}
8585

8686
async fn remove_buffered_signatures(
8787
&self,
88-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
88+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
8989
single_signatures: Vec<SingleSignatures>,
9090
) -> StdResult<()> {
9191
let signatures_party_ids = single_signatures.into_iter().map(|s| s.party_id).collect();
9292
self.connection.fetch_first(
9393
DeleteBufferedSingleSignatureQuery::by_discriminant_and_party_ids(
94-
signed_entity_type_discriminants,
94+
signed_entity_type_discriminant,
9595
signatures_party_ids,
9696
),
9797
)?;

mithril-aggregator/src/dependency_injection/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ impl DependenciesBuilder {
12771277
Ok(Arc::new(authenticator))
12781278
}
12791279

1280-
/// [MithrilSignerRegisterer] service
1280+
/// [SingleSignatureAuthenticator] service
12811281
pub async fn get_single_signature_authenticator(
12821282
&mut self,
12831283
) -> Result<Arc<SingleSignatureAuthenticator>> {

mithril-aggregator/src/http_server/routes/signatures_routes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ mod tests {
168168
}
169169

170170
#[tokio::test]
171-
async fn test_register_signatures_return_404_if_authentication_fail() {
171+
async fn test_register_signatures_return_400_if_authentication_fail() {
172172
let mut mock_certifier_service = MockCertifierService::new();
173173
mock_certifier_service
174174
.expect_register_single_signature()

mithril-aggregator/src/services/certifier/interface.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,20 @@ pub trait BufferedSingleSignatureStore: Sync + Send {
139139
/// Buffer a single signature for later use.
140140
async fn buffer_signature(
141141
&self,
142-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
142+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
143143
signature: &SingleSignatures,
144144
) -> StdResult<()>;
145145

146146
/// Get the buffered single signatures for the given signed entity discriminant.
147147
async fn get_buffered_signatures(
148148
&self,
149-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
149+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
150150
) -> StdResult<Vec<SingleSignatures>>;
151151

152152
/// Remove the given single signatures from the buffer.
153153
async fn remove_buffered_signatures(
154154
&self,
155-
signed_entity_type_discriminants: SignedEntityTypeDiscriminants,
155+
signed_entity_type_discriminant: SignedEntityTypeDiscriminants,
156156
single_signatures: Vec<SingleSignatures>,
157157
) -> StdResult<()>;
158158
}

mithril-common/src/entities/single_signatures.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ pub struct SingleSignatures {
2929
/// Status of the authentication of the signer that emitted the signature
3030
#[derive(Debug, Copy, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
3131
pub enum SingleSignatureAuthenticationStatus {
32-
/// We could authenticate the signer that emitted the signature
32+
/// The signer that emitted the signature is authenticated
3333
Authenticated,
34-
/// We could not authenticate the signer that emitted the signature
34+
/// The signer that emitted the signature is not authenticated
3535
#[default]
3636
Unauthenticated,
3737
}

0 commit comments

Comments
 (0)