Merge pull request #219 from teonite/fix_cancel_reservations_args

Fix cancel reservations args

Author: wojcik91

lib/cli/arg_handling.rs

@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use casper_types::system::auction::{Reservation, ARG_VALIDATOR};
+use casper_types::system::auction::{DelegatorKind, Reservation, ARG_VALIDATOR};
 use casper_types::TransferTarget;
 use casper_types::{bytesrepr::ToBytes, CLTyped, CLValueError, PublicKey, RuntimeArgs, URef, U512};
 
@@ -48,7 +48,7 @@ const ADD_RESERVATIONS_ARG_RESERVATIONS: RequiredArg<Vec<Reservation>> =
     RequiredArg::new("reservations");
 
 const CANCEL_RESERVATIONS_ARG_VALIDATOR: RequiredArg<PublicKey> = RequiredArg::new("validator");
-const CANCEL_RESERVATIONS_ARG_DELEGATORS: RequiredArg<Vec<PublicKey>> =
+const CANCEL_RESERVATIONS_ARG_DELEGATORS: RequiredArg<Vec<DelegatorKind>> =
     RequiredArg::new("delegators");
 
 struct RequiredArg<T> {
@@ -149,7 +149,7 @@ pub fn new_add_reservations_args(
 /// Creates a `RuntimeArgs` suitable for use in a cancel reservations transaction.
 pub fn new_cancel_reservations_args(
     validator: PublicKey,
-    delegators: Vec<PublicKey>,
+    delegators: Vec<DelegatorKind>,
 ) -> Result<RuntimeArgs, CLValueError> {
     let mut args = RuntimeArgs::new();
     CANCEL_RESERVATIONS_ARG_VALIDATOR.insert(&mut args, validator)?;

lib/cli/tests.rs

@@ -447,9 +447,10 @@ mod transaction {
     use super::*;
     use crate::{cli::TransactionV1BuilderError, Error::TransactionBuild};
     use casper_types::{
-        bytesrepr::Bytes, system::auction::Reservation, PackageAddr, TransactionArgs,
-        TransactionEntryPoint, TransactionInvocationTarget, TransactionRuntimeParams,
-        TransactionTarget, TransferTarget,
+        bytesrepr::Bytes,
+        system::auction::{DelegatorKind, Reservation},
+        PackageAddr, TransactionArgs, TransactionEntryPoint, TransactionInvocationTarget,
+        TransactionRuntimeParams, TransactionTarget, TransferTarget,
     };
     use once_cell::sync::Lazy;
     use rand::{thread_rng, Rng};
@@ -1092,7 +1093,7 @@ mod transaction {
         let delegators = (0..rng.gen_range(1..10))
             .map(|_| {
                 let secret_key = SecretKey::generate_ed25519().unwrap();
-                PublicKey::from(&secret_key)
+                DelegatorKind::PublicKey(PublicKey::from(&secret_key))
             })
             .collect();
 
@@ -1448,7 +1449,7 @@ mod transaction {
 
         let maybe_source = Some(source_uref);
 
-        let source_uref_cl = &CLValue::from_t(&source_uref).unwrap();
+        let source_uref_cl = &CLValue::from_t(source_uref).unwrap();
         let target_uref_cl = &CLValue::from_t(target_uref).unwrap();
 
         let transaction_string_params = TransactionStrParams {

lib/cli/transaction_builder_params.rs

@@ -1,6 +1,8 @@
 use casper_types::{
-    bytesrepr::Bytes, system::auction::Reservation, AddressableEntityHash, PackageHash, PublicKey,
-    TransactionRuntimeParams, TransferTarget, URef, U512,
+    bytesrepr::Bytes,
+    system::auction::{DelegatorKind, Reservation},
+    AddressableEntityHash, PackageHash, PublicKey, TransactionRuntimeParams, TransferTarget, URef,
+    U512,
 };
 
 /// An enum representing the parameters needed to construct a transaction builder
@@ -69,7 +71,7 @@ pub enum TransactionBuilderParams<'a> {
         /// The validator for the cancel reservations transaction
         validator: PublicKey,
         /// List of delegatora for the cancel reservations transaction
-        delegators: Vec<PublicKey>,
+        delegators: Vec<DelegatorKind>,
     },
     /// Parameters for the invocable entity variant of the transaction builder
     InvocableEntity {

lib/cli/transaction_v1_builder.rs

@@ -9,7 +9,7 @@ use alloc::collections::BTreeSet;
 use alloc::vec::Vec;
 use casper_types::{
     bytesrepr::{Bytes, ToBytes},
-    system::auction::Reservation,
+    system::auction::{DelegatorKind, Reservation},
     AddressableEntityHash, CLValueError, Digest, EntityVersion, InitiatorAddr, PackageHash,
     PricingMode, PublicKey, RuntimeArgs, SecretKey, TimeDiff, Timestamp, TransactionArgs,
     TransactionEntryPoint, TransactionInvocationTarget, TransactionRuntimeParams,
@@ -303,7 +303,7 @@ impl<'a> TransactionV1Builder<'a> {
     /// transaction.
     pub fn new_cancel_reservations(
         validator: PublicKey,
-        delegators: Vec<PublicKey>,
+        delegators: Vec<DelegatorKind>,
     ) -> Result<Self, CLValueError> {
         let args = arg_handling::new_cancel_reservations_args(validator, delegators)?;
         let mut builder = TransactionV1Builder::new();

src/transaction/creation_common.rs

@@ -1467,10 +1467,10 @@ mod reservations {
 mod delegators {
     use super::*;
     use casper_client::cli::CliError;
-    use casper_types::PublicKey;
+    use casper_types::system::auction::DelegatorKind;
 
     pub const ARG_NAME: &str = "delegators";
-    const ARG_VALUE_NAME: &str = "JSON serialized Vec<PublicKey>";
+    const ARG_VALUE_NAME: &str = "JSON serialized Vec<DelegatorKind>";
     const ARG_HELP: &str = "list of delegator public keys for the cancel-reservations transaction";
 
     pub fn arg() -> Arg {
@@ -1489,7 +1489,7 @@ mod delegators {
             .unwrap_or_default()
     }
 
-    pub(super) fn parse_delegators(value: &str) -> Result<Vec<PublicKey>, CliError> {
+    pub(super) fn parse_delegators(value: &str) -> Result<Vec<DelegatorKind>, CliError> {
         if !value.is_empty() {
             serde_json::from_str(value).map_err(|_| {
                 CliError::InvalidCLValue(