refactor(iota): use new system-state summary type (#5502)

Author: kodemartin

crates/iota/src/fire_drill.rs

@@ -34,6 +34,7 @@ use iota_types::{
     base_types::{IotaAddress, ObjectRef},
     committee::EpochId,
     crypto::{IotaKeyPair, generate_proof_of_possession, get_authority_key_pair, get_key_pair},
+    iota_system_state::iota_system_state_summary::IotaSystemStateSummary,
     multiaddr::{Multiaddr, Protocol},
     transaction::{CallArg, TEST_ONLY_GAS_UNIT_FOR_GENERIC, Transaction, TransactionData},
 };
@@ -160,11 +161,16 @@ async fn update_next_epoch_metadata(
     new_config.protocol_key_pair =
         KeyPairWithPath::new(IotaKeyPair::Ed25519(new_protocol_key_pair));
 
-    let validators = iota_client
+    let iota_system_state = iota_client
         .governance_api()
         .get_latest_iota_system_state()
-        .await?
-        .active_validators;
+        .await?;
+    let validators = match iota_system_state {
+        IotaSystemStateSummary::V1(v1) => v1.active_validators,
+        IotaSystemStateSummary::V2(v2) => v2.active_validators,
+        _ => panic!("unsupported IotaSystemStateSummary"),
+    };
+
     let self_validator = validators
         .iter()
         .find(|v| v.iota_address == iota_address)

crates/iota/src/validator_commands.rs

@@ -550,11 +550,16 @@ impl IotaValidatorCommand {
                 )?;
                 // Make sure the address is a validator
                 let iota_client = context.get_client().await?;
-                let active_validators = iota_client
+                let iota_system_state = iota_client
                     .governance_api()
                     .get_latest_iota_system_state()
-                    .await?
-                    .active_validators;
+                    .await?;
+                let active_validators = match iota_system_state {
+                    IotaSystemStateSummary::V1(v1) => v1.active_validators,
+                    IotaSystemStateSummary::V2(v2) => v2.active_validators,
+                    _ => panic!("unsupported IotaSystemStateSummary"),
+                };
+
                 if !active_validators
                     .into_iter()
                     .any(|s| s.iota_address == address)
@@ -686,11 +691,15 @@ impl IotaValidatorCommand {
             IotaValidatorCommand::List => {
                 let client = context.get_client().await?;
 
-                let active_validators = client
+                let iota_system_state = client
                     .governance_api()
                     .get_latest_iota_system_state()
-                    .await?
-                    .active_validators;
+                    .await?;
+                let active_validators = match iota_system_state {
+                    IotaSystemStateSummary::V1(v1) => v1.active_validators,
+                    IotaSystemStateSummary::V2(v2) => v2.active_validators,
+                    _ => panic!("unsupported IotaSystemStateSummary"),
+                };
 
                 let mut builder = Builder::default();
 
@@ -1070,14 +1079,16 @@ pub async fn get_validator_summary(
     client: &IotaClient,
     validator_address: IotaAddress,
 ) -> anyhow::Result<Option<(ValidatorStatus, IotaValidatorSummary)>> {
-    let IotaSystemStateSummary {
-        active_validators,
-        pending_active_validators_id,
-        ..
-    } = client
+    let iota_system_state = client
         .governance_api()
         .get_latest_iota_system_state()
         .await?;
+    let (active_validators, pending_active_validators_id) = match iota_system_state {
+        IotaSystemStateSummary::V1(v1) => (v1.active_validators, v1.pending_active_validators_id),
+        IotaSystemStateSummary::V2(v2) => (v2.active_validators, v2.pending_active_validators_id),
+        _ => panic!("unsupported IotaSystemStateSummary"),
+    };
+
     let mut status = None;
     let mut active_validators = active_validators
         .into_iter()

crates/iota/tests/cli_tests.rs

@@ -60,6 +60,7 @@ use iota_types::{
     },
     error::IotaObjectResponseError,
     gas_coin::GasCoin,
+    iota_system_state::iota_system_state_summary::IotaSystemStateSummary,
     object::Owner,
     transaction::{
         TEST_ONLY_GAS_UNIT_FOR_GENERIC, TEST_ONLY_GAS_UNIT_FOR_OBJECT_BASICS,
@@ -3029,12 +3030,17 @@ async fn test_stake_with_none_amount() -> Result<(), anyhow::Error> {
         .data;
 
     let config_path = test_cluster.swarm.dir().join(IOTA_CLIENT_CONFIG);
-    let validator_addr = client
+    let iota_system_state = client
         .governance_api()
         .get_latest_iota_system_state()
-        .await?
-        .active_validators[0]
-        .iota_address;
+        .await?;
+    let active_validators = match iota_system_state {
+        IotaSystemStateSummary::V1(v1) => v1.active_validators,
+        IotaSystemStateSummary::V2(v2) => v2.active_validators,
+        _ => panic!("unsupported IotaSystemStateSummary"),
+    };
+
+    let validator_addr = active_validators[0].iota_address;
 
     test_with_iota_binary(&[
         "client",
@@ -3081,12 +3087,17 @@ async fn test_stake_with_u64_amount() -> Result<(), anyhow::Error> {
         .data;
 
     let config_path = test_cluster.swarm.dir().join(IOTA_CLIENT_CONFIG);
-    let validator_addr = client
+    let iota_system_state = client
         .governance_api()
         .get_latest_iota_system_state()
-        .await?
-        .active_validators[0]
-        .iota_address;
+        .await?;
+    let active_validators = match iota_system_state {
+        IotaSystemStateSummary::V1(v1) => v1.active_validators,
+        IotaSystemStateSummary::V2(v2) => v2.active_validators,
+        _ => panic!("unsupported IotaSystemStateSummary"),
+    };
+
+    let validator_addr = active_validators[0].iota_address;
 
     test_with_iota_binary(&[
         "client",