refactor: rename allowed_delta to be weight_reduction_allowed_delta

Author: zhouwfang

crates/e2e-tests/src/e2e_flow.rs

@@ -1378,11 +1378,11 @@ mod tests {
             .current_committee()
             .unwrap();
         assert_eq!(
-            epoch1_committee.threshold_basis_points(),
+            epoch1_committee.mpc_threshold_basis_points(),
             DEFAULT_MPC_THRESHOLD_BASIS_POINTS
         );
         assert_eq!(
-            epoch1_committee.allowed_delta(),
+            epoch1_committee.mpc_weight_reduction_allowed_delta(),
             DEFAULT_MPC_WEIGHT_REDUCTION_ALLOWED_DELTA
         );
 
@@ -1397,7 +1397,7 @@ mod tests {
                     hashi_types::move_types::ConfigValue::U64(new_threshold),
                 ),
                 (
-                    "mpc_allowed_delta".into(),
+                    "mpc_weight_reduction_allowed_delta".into(),
                     hashi_types::move_types::ConfigValue::U64(new_delta),
                 ),
             ],
@@ -1444,25 +1444,25 @@ mod tests {
         };
         let epoch1 = committees.get(&initial_epoch).expect("epoch 1 committee");
         assert_eq!(
-            epoch1.threshold_basis_points(),
+            epoch1.mpc_threshold_basis_points(),
             DEFAULT_MPC_THRESHOLD_BASIS_POINTS,
             "epoch {initial_epoch} committee should retain original threshold_basis_points"
         );
         assert_eq!(
-            epoch1.allowed_delta(),
+            epoch1.mpc_weight_reduction_allowed_delta(),
             DEFAULT_MPC_WEIGHT_REDUCTION_ALLOWED_DELTA,
             "epoch {initial_epoch} committee should retain original allowed_delta"
         );
 
         // Epoch 2 committee has new values.
         let epoch2 = committees.get(&target_epoch).expect("epoch 2 committee");
         assert_eq!(
-            epoch2.threshold_basis_points(),
+            epoch2.mpc_threshold_basis_points(),
             new_threshold as u16,
             "epoch {target_epoch} committee should have updated threshold_basis_points"
         );
         assert_eq!(
-            epoch2.allowed_delta(),
+            epoch2.mpc_weight_reduction_allowed_delta(),
             new_delta as u16,
             "epoch {target_epoch} committee should have updated allowed_delta"
         );

crates/hashi-types/proto/sui/hashi/v1alpha/signature.proto

@@ -6,8 +6,8 @@ message Committee {
   optional uint64 epoch = 1;
   repeated CommitteeMember members = 2;
   optional uint64 total_weight = 3;
-  optional uint64 threshold_basis_points = 4;
-  optional uint64 allowed_delta = 5;
+  optional uint64 mpc_threshold_basis_points = 4;
+  optional uint64 mpc_weight_reduction_allowed_delta = 5;
 }
 
 message CommitteeMember {

crates/hashi-types/src/committee.rs

@@ -93,8 +93,8 @@ pub struct Committee {
     members: Vec<CommitteeMember>,
     address_to_index: HashMap<Address, usize>,
     total_weight: u64,
-    threshold_basis_points: u16,
-    allowed_delta: u16,
+    mpc_threshold_basis_points: u16,
+    mpc_weight_reduction_allowed_delta: u16,
 }
 
 #[derive(Clone, PartialEq)]
@@ -160,8 +160,8 @@ impl Committee {
     pub fn new(
         members: Vec<CommitteeMember>,
         epoch: u64,
-        threshold_basis_points: u16,
-        allowed_delta: u16,
+        mpc_threshold_basis_points: u16,
+        mpc_weight_reduction_allowed_delta: u16,
     ) -> Self {
         let total_weight = members.iter().map(|member| member.weight).sum();
         let address_to_index = members
@@ -174,8 +174,8 @@ impl Committee {
             members,
             address_to_index,
             total_weight,
-            threshold_basis_points,
-            allowed_delta,
+            mpc_threshold_basis_points,
+            mpc_weight_reduction_allowed_delta,
         }
     }
 
@@ -192,12 +192,12 @@ impl Committee {
         self.total_weight
     }
 
-    pub fn threshold_basis_points(&self) -> u16 {
-        self.threshold_basis_points
+    pub fn mpc_threshold_basis_points(&self) -> u16 {
+        self.mpc_threshold_basis_points
     }
 
-    pub fn allowed_delta(&self) -> u16 {
-        self.allowed_delta
+    pub fn mpc_weight_reduction_allowed_delta(&self) -> u16 {
+        self.mpc_weight_reduction_allowed_delta
     }
 
     fn member(&self, address: &Address) -> Result<&CommitteeMember, SignatureError> {

crates/hashi-types/src/guardian/proto_conversions.rs

@@ -670,14 +670,19 @@ fn pb_to_hashi_committee(c: pb::Committee) -> GuardianResult<HashiCommittee> {
     let total_weight = c.total_weight.ok_or_else(|| missing("total_weight"))?;
 
     let threshold_basis_points = c
-        .threshold_basis_points
+        .mpc_threshold_basis_points
         .map(|v| v as u16)
         .unwrap_or(DEFAULT_MPC_THRESHOLD_BASIS_POINTS);
-    let allowed_delta = c
-        .allowed_delta
+    let weight_reduction_allowed_delta = c
+        .mpc_weight_reduction_allowed_delta
         .map(|v| v as u16)
         .unwrap_or(DEFAULT_MPC_WEIGHT_REDUCTION_ALLOWED_DELTA);
-    let committee = HashiCommittee::new(members, epoch, threshold_basis_points, allowed_delta);
+    let committee = HashiCommittee::new(
+        members,
+        epoch,
+        threshold_basis_points,
+        weight_reduction_allowed_delta,
+    );
 
     if committee.total_weight() != total_weight {
         return Err(InvalidInputs(format!(
@@ -698,8 +703,8 @@ fn hashi_committee_to_pb(c: HashiCommittee) -> pb::Committee {
             .map(|m| hashi_committee_member_to_pb(m.clone()))
             .collect(),
         total_weight: Some(c.total_weight()),
-        threshold_basis_points: Some(c.threshold_basis_points() as u64),
-        allowed_delta: Some(c.allowed_delta() as u64),
+        mpc_threshold_basis_points: Some(c.mpc_threshold_basis_points() as u64),
+        mpc_weight_reduction_allowed_delta: Some(c.mpc_weight_reduction_allowed_delta() as u64),
     }
 }
 

crates/hashi-types/src/move_types/mod.rs

@@ -156,10 +156,8 @@ pub struct Committee {
     pub members: Vec<CommitteeMember>,
     /// Total voting weight of the committee.
     pub total_weight: u64,
-    /// MPC threshold in basis points
-    pub threshold_basis_points: u64,
-    /// Allowed delta for weight reduction
-    pub allowed_delta: u64,
+    pub mpc_threshold_basis_points: u64,
+    pub mpc_weight_reduction_allowed_delta: u64,
 }
 
 /// Rust version of the Move hashi::config::Config type.
@@ -1105,8 +1103,8 @@ impl From<&crate::committee::Committee> for Committee {
             epoch: c.epoch(),
             members: c.members().iter().map(Into::into).collect(),
             total_weight: c.total_weight(),
-            threshold_basis_points: c.threshold_basis_points() as u64,
-            allowed_delta: c.allowed_delta() as u64,
+            mpc_threshold_basis_points: c.mpc_threshold_basis_points() as u64,
+            mpc_weight_reduction_allowed_delta: c.mpc_weight_reduction_allowed_delta() as u64,
         }
     }
 }
@@ -1123,9 +1121,10 @@ impl TryFrom<Committee> for crate::committee::Committee {
         Ok(crate::committee::Committee::new(
             members,
             c.epoch,
-            u16::try_from(c.threshold_basis_points)
-                .expect("threshold_basis_points exceeds u16::MAX"),
-            u16::try_from(c.allowed_delta).expect("allowed_delta exceeds u16::MAX"),
+            u16::try_from(c.mpc_threshold_basis_points)
+                .expect("mpc_threshold_basis_points exceeds u16::MAX"),
+            u16::try_from(c.mpc_weight_reduction_allowed_delta)
+                .expect("mpc_weight_reduction_allowed_delta exceeds u16::MAX"),
         ))
     }
 }

crates/hashi-types/src/proto/generated/sui.hashi.v1alpha.fds.bin

@@ -2823,9 +2823,9 @@ pub struct Committee {
     #[prost(uint64, optional, tag = "3")]
     pub total_weight: ::core::option::Option<u64>,
     #[prost(uint64, optional, tag = "4")]
-    pub threshold_basis_points: ::core::option::Option<u64>,
+    pub mpc_threshold_basis_points: ::core::option::Option<u64>,
     #[prost(uint64, optional, tag = "5")]
-    pub allowed_delta: ::core::option::Option<u64>,
+    pub mpc_weight_reduction_allowed_delta: ::core::option::Option<u64>,
 }
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CommitteeMember {

crates/hashi-types/src/proto/generated/sui.hashi.v1alpha.rs

@@ -146,8 +146,8 @@ impl MpcManager {
             .clone();
         let (nodes, threshold) = build_reduced_nodes(
             &committee,
-            committee.threshold_basis_points(),
-            committee.allowed_delta(),
+            committee.mpc_threshold_basis_points(),
+            committee.mpc_weight_reduction_allowed_delta(),
             weight_divisor,
         )?;
         let total_weight = nodes.total_weight();
@@ -205,8 +205,8 @@ impl MpcManager {
             Some(prev_committee) => {
                 let (nodes, threshold) = build_reduced_nodes(
                     prev_committee,
-                    prev_committee.threshold_basis_points(),
-                    prev_committee.allowed_delta(),
+                    prev_committee.mpc_threshold_basis_points(),
+                    prev_committee.mpc_weight_reduction_allowed_delta(),
                     weight_divisor,
                 )?;
                 (Some(nodes), Some(threshold))

crates/hashi/src/mpc/mpc_except_signing.rs

@@ -994,10 +994,16 @@ fn convert_move_committee(c: move_types::Committee) -> Committee {
         .into_iter()
         .map(convert_move_committee_member)
         .collect();
-    let threshold_basis_points =
-        u16::try_from(c.threshold_basis_points).expect("threshold_basis_points exceeds u16::MAX");
-    let allowed_delta = u16::try_from(c.allowed_delta).expect("allowed_delta exceeds u16::MAX");
-    Committee::new(members, c.epoch, threshold_basis_points, allowed_delta)
+    let threshold_basis_points = u16::try_from(c.mpc_threshold_basis_points)
+        .expect("mpc_threshold_basis_points exceeds u16::MAX");
+    let weight_reduction_allowed_delta = u16::try_from(c.mpc_weight_reduction_allowed_delta)
+        .expect("mpc_weight_reduction_allowed_delta exceeds u16::MAX");
+    Committee::new(
+        members,
+        c.epoch,
+        threshold_basis_points,
+        weight_reduction_allowed_delta,
+    )
 }
 
 fn convert_move_uncompressed_g1_pubkey(uncompressed_g1: &[u8]) -> BLS12381PublicKey {

crates/hashi/src/onchain/mod.rs

@@ -36,18 +36,16 @@ public struct Committee has copy, drop, store {
     members: vector<CommitteeMember>,
     /// Total voting weight of the committee.
     total_weight: u64,
-    /// MPC threshold in basis points
-    threshold_basis_points: u64,
-    /// Allowed delta for weight reduction
-    allowed_delta: u64,
+    mpc_threshold_basis_points: u64,
+    mpc_weight_reduction_allowed_delta: u64,
 }
 
 /// Constructor for committee.
 public(package) fun new_committee(
     epoch: u64,
     members: vector<CommitteeMember>,
-    threshold_basis_points: u64,
-    allowed_delta: u64,
+    mpc_threshold_basis_points: u64,
+    mpc_weight_reduction_allowed_delta: u64,
 ): Committee {
     assert!(!members.is_empty());
 
@@ -59,7 +57,13 @@ public(package) fun new_committee(
         total_weight = total_weight + weight;
     });
 
-    Committee { members, total_weight, epoch, threshold_basis_points, allowed_delta }
+    Committee {
+        members,
+        total_weight,
+        epoch,
+        mpc_threshold_basis_points,
+        mpc_weight_reduction_allowed_delta,
+    }
 }
 
 /// Constructor for committee member.