refactor(proposal): drop the Quorum prefix from VoteOutcome variants

This commit is contained in:
CleverWild
2026-08-26 15:30:48 +02:00
parent d64478b301
commit b364d95489
3 changed files with 19 additions and 19 deletions

View File

@@ -143,8 +143,8 @@ impl ProposalKind {
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub enum VoteOutcome { pub enum VoteOutcome {
Pending, Pending,
QuorumApproved, Approved,
QuorumRejected, Rejected,
} }
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
@@ -445,7 +445,7 @@ impl ProposalManager {
.await?; .await?;
drop(conn); // release connection before async execution drop(conn); // release connection before async execution
self.execute_proposal(&proposal).await?; self.execute_proposal(&proposal).await?;
return Ok(VoteOutcome::QuorumApproved); return Ok(VoteOutcome::Approved);
} }
let total_eligible = total_operators + total_recovery; let total_eligible = total_operators + total_recovery;
@@ -454,7 +454,7 @@ impl ProposalManager {
.set(schema::proposal::status.eq(ProposalStatus::Rejected)) .set(schema::proposal::status.eq(ProposalStatus::Rejected))
.execute(&mut conn) .execute(&mut conn)
.await?; .await?;
return Ok(VoteOutcome::QuorumRejected); return Ok(VoteOutcome::Rejected);
} }
Ok(VoteOutcome::Pending) Ok(VoteOutcome::Pending)
@@ -611,7 +611,7 @@ impl ProposalManager {
.await?; .await?;
drop(conn); drop(conn);
self.execute_proposal(&proposal).await?; self.execute_proposal(&proposal).await?;
return Ok(VoteOutcome::QuorumApproved); return Ok(VoteOutcome::Approved);
} }
let recovery_reject: i64 = schema::recovery_proposal_vote::table let recovery_reject: i64 = schema::recovery_proposal_vote::table
@@ -633,7 +633,7 @@ impl ProposalManager {
.set(schema::proposal::status.eq(ProposalStatus::Rejected)) .set(schema::proposal::status.eq(ProposalStatus::Rejected))
.execute(&mut conn) .execute(&mut conn)
.await?; .await?;
return Ok(VoteOutcome::QuorumRejected); return Ok(VoteOutcome::Rejected);
} }
Ok(VoteOutcome::Pending) Ok(VoteOutcome::Pending)

View File

@@ -100,8 +100,8 @@ async fn handle_vote(
let outcome = match result { let outcome = match result {
Ok(VoteOutcome::Pending) => ProtoVoteOutcome::Pending, Ok(VoteOutcome::Pending) => ProtoVoteOutcome::Pending,
Ok(VoteOutcome::QuorumApproved) => ProtoVoteOutcome::Approved, Ok(VoteOutcome::Approved) => ProtoVoteOutcome::Approved,
Ok(VoteOutcome::QuorumRejected) => ProtoVoteOutcome::Rejected, Ok(VoteOutcome::Rejected) => ProtoVoteOutcome::Rejected,
Err(kameo::error::SendError::HandlerError(ProposalError::AlreadyVoted)) => { Err(kameo::error::SendError::HandlerError(ProposalError::AlreadyVoted)) => {
return Err(Status::invalid_argument("Already voted on this proposal")); return Err(Status::invalid_argument("Already voted on this proposal"));
} }

View File

@@ -174,7 +174,7 @@ async fn single_operator_vote_reaches_quorum() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
} }
#[tokio::test] #[tokio::test]
@@ -363,7 +363,7 @@ async fn query_pending_excludes_already_voted() {
.await .await
.unwrap(); .unwrap();
// Vote on p1 — with 1 operator this reaches quorum (QuorumApproved) // Vote on p1 — with 1 operator this reaches quorum (Approved)
let msg = make_vote_message(p1, true); let msg = make_vote_message(p1, true);
let sig = signing_key let sig = signing_key
.sign_message(&msg, SigningContext::GovernanceVote) .sign_message(&msg, SigningContext::GovernanceVote)
@@ -378,7 +378,7 @@ async fn query_pending_excludes_already_voted() {
}) })
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
// QueryPending should return only p2 // QueryPending should return only p2
let pending = actors let pending = actors
@@ -490,7 +490,7 @@ async fn approve_sdk_client_writes_integrity_envelope() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
let mut conn = db.get().await.unwrap(); let mut conn = db.get().await.unwrap();
let count: i64 = integrity_envelope::table let count: i64 = integrity_envelope::table
@@ -544,7 +544,7 @@ async fn grant_wallet_access_on_quorum_approval() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
let mut conn = db.get().await.unwrap(); let mut conn = db.get().await.unwrap();
let count: i64 = evm_wallet_access::table let count: i64 = evm_wallet_access::table
@@ -635,7 +635,7 @@ async fn approve_persistent_grant_creates_basic_grant_row() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
let mut conn = db.get().await.unwrap(); let mut conn = db.get().await.unwrap();
let count: i64 = evm_basic_grant::table let count: i64 = evm_basic_grant::table
@@ -752,7 +752,7 @@ async fn approve_one_off_transaction_stores_result() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
let mut conn = db.get().await.unwrap(); let mut conn = db.get().await.unwrap();
let count: i64 = proposal_result::table let count: i64 = proposal_result::table
@@ -805,7 +805,7 @@ async fn replace_operator_updates_pubkey_and_starts_rekey() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
let mut conn = db.get().await.unwrap(); let mut conn = db.get().await.unwrap();
// The old identity row is updated in-place; count stays the same. // The old identity row is updated in-place; count stays the same.
@@ -864,7 +864,7 @@ async fn trigger_rekey_reaches_quorum() {
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
} }
#[tokio::test] #[tokio::test]
@@ -914,7 +914,7 @@ async fn key_rotation_requires_full_quorum() {
// For key rotation, they must not. // For key rotation, they must not.
assert_eq!(cast(op1, &key1).await, VoteOutcome::Pending); assert_eq!(cast(op1, &key1).await, VoteOutcome::Pending);
assert_eq!(cast(op2, &key2).await, VoteOutcome::Pending); assert_eq!(cast(op2, &key2).await, VoteOutcome::Pending);
assert_eq!(cast(op3, &key3).await, VoteOutcome::QuorumApproved); assert_eq!(cast(op3, &key3).await, VoteOutcome::Approved);
} }
// ─── §3.5 / §3.6 Recovery Operator tests ────────────────────────────────── // ─── §3.5 / §3.6 Recovery Operator tests ──────────────────────────────────
@@ -1123,5 +1123,5 @@ async fn recovery_operator_vote_contributes_to_replace_quorum() {
}) })
.await .await
.unwrap(); .unwrap();
assert_eq!(outcome, VoteOutcome::QuorumApproved); assert_eq!(outcome, VoteOutcome::Approved);
} }