Fix query global state

lib/cli.rs

@@ -235,8 +235,7 @@ pub async fn query_global_state(
     let rpc_id = parse::rpc_id(maybe_rpc_id);
     let verbosity = parse::verbosity(verbosity_level);
     let global_state_identifier =
-        parse::global_state_identifier(maybe_block_id, maybe_state_root_hash)?
-            .ok_or(CliError::FailedToParseStateIdentifier)?;
+        parse::global_state_identifier(maybe_block_id, maybe_state_root_hash)?;
     let key = parse::key_for_query(key)?;
     let path = if path.is_empty() {
         vec![]

lib/cli/error.rs

@@ -13,7 +13,7 @@
 
 use crate::cli::JsonArgsError;
 #[cfg(doc)]
-use crate::rpcs::{DictionaryItemIdentifier, GlobalStateIdentifier};
+use crate::rpcs::DictionaryItemIdentifier;
 
 /// Error that can be returned by the `cli` API.
 #[derive(Error, Debug)]
@@ -134,7 +134,7 @@
         error: casper_types::DigestError,
     },
 
     /// Failed to create a [`GlobalStateIdentifier`].
     #[error("failed to parse state identifier")]
     FailedToParseStateIdentifier,
 

lib/cli/parse.rs

@@ -733,6 +733,10 @@ pub(super) fn global_state_identifier(
     maybe_block_id: &str,
     maybe_state_root_hash: &str,
 ) -> Result<Option<GlobalStateIdentifier>, CliError> {
+    if maybe_state_root_hash.is_empty() && maybe_block_id.is_empty() {
+        return Ok(None);
+    }
+
     match block_identifier(maybe_block_id)? {
         Some(BlockIdentifier::Hash(hash)) => {
             return Ok(Some(GlobalStateIdentifier::BlockHash(hash)))

lib/lib.rs

@@ -440,7 +440,7 @@ pub async fn query_global_state(
     rpc_id: JsonRpcId,
     node_address: &str,
     verbosity: Verbosity,
-    global_state_identifier: GlobalStateIdentifier,
+    global_state_identifier: Option<GlobalStateIdentifier>,
     key: Key,
     path: Vec<String>,
 ) -> Result<SuccessResponse<QueryGlobalStateResult>, Error> {

lib/rpcs.rs

@@ -17,5 +17,4 @@ pub use v2_0_0::{
     get_entity::{AddressableEntity, EntityIdentifier, EntityOrAccount},
     get_reward::EraIdentifier,
     query_balance::PurseIdentifier,
-    query_global_state::GlobalStateIdentifier,
 };

lib/rpcs/v1_5_0.rs

@@ -87,11 +87,4 @@ pub(crate) mod put_deploy {
     pub(crate) use crate::rpcs::v1_4_5::put_deploy::{PutDeployParams, PUT_DEPLOY_METHOD};
 }
 
-pub(crate) mod query_global_state {
-    pub use crate::rpcs::v1_4_5::query_global_state::{
-        GlobalStateIdentifier, QueryGlobalStateResult,
-    };
-    pub(crate) use crate::rpcs::v1_4_5::query_global_state::{
-        QueryGlobalStateParams, QUERY_GLOBAL_STATE_METHOD,
-    };
-}
+pub(crate) mod query_global_state {}

lib/rpcs/v1_6_0.rs

@@ -2,8 +2,9 @@
 
 pub(crate) mod get_account;
 
-// The following RPCs are all unchanged from v1.5.0, so we just re-export them.
+pub mod query_global_state;
 
+// The following RPCs are all unchanged from v1.5.0, so we just re-export them.
 pub(crate) mod get_chainspec {
     pub use crate::rpcs::v1_5_0::get_chainspec::GetChainspecResult;
     pub(crate) use crate::rpcs::v1_5_0::get_chainspec::GET_CHAINSPEC_METHOD;
@@ -109,12 +110,3 @@ pub(crate) mod put_deploy {
     pub use crate::rpcs::v1_5_0::put_deploy::PutDeployResult;
     pub(crate) use crate::rpcs::v1_5_0::put_deploy::{PutDeployParams, PUT_DEPLOY_METHOD};
 }
-
-pub(crate) mod query_global_state {
-    pub use crate::rpcs::v1_5_0::query_global_state::{
-        GlobalStateIdentifier, QueryGlobalStateResult,
-    };
-    pub(crate) use crate::rpcs::v1_5_0::query_global_state::{
-        QueryGlobalStateParams, QUERY_GLOBAL_STATE_METHOD,
-    };
-}

lib/rpcs/v1_6_0/query_global_state.rs

@@ -1,12 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use casper_types::{Key, ProtocolVersion};
+use casper_types::{BlockHeader, Key, ProtocolVersion, StoredValue};
 
+use crate::rpcs::common::GlobalStateIdentifier;
 pub(crate) use crate::rpcs::v1_4_5::query_global_state::QUERY_GLOBAL_STATE_METHOD;
-use crate::{
-    rpcs::common::GlobalStateIdentifier,
-    types::{BlockHeader, StoredValue},
-};
 
 #[cfg(doc)]
 use crate::BlockIdentifier;

lib/rpcs/v2_0_0.rs

@@ -89,11 +89,10 @@ pub(crate) mod put_deploy {
     pub(crate) use crate::rpcs::v1_6_0::put_deploy::{PutDeployParams, PUT_DEPLOY_METHOD};
 }
 
-pub(crate) mod query_global_state {
-    pub use crate::rpcs::v1_6_0::query_global_state::{
-        GlobalStateIdentifier, QueryGlobalStateResult,
-    };
+pub mod query_global_state {
     pub(crate) use crate::rpcs::v1_6_0::query_global_state::{
         QueryGlobalStateParams, QUERY_GLOBAL_STATE_METHOD,
     };
+
+    pub use crate::rpcs::v1_6_0::query_global_state::QueryGlobalStateResult;
 }

lib/rpcs/v2_0_0/query_balance_details.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use casper_types::{BlockTime, ProtocolVersion, U512};
 
-use crate::rpcs::{GlobalStateIdentifier, PurseIdentifier};
+use crate::rpcs::{common::GlobalStateIdentifier, PurseIdentifier};
 
 pub(crate) const QUERY_BALANCE_DETAILS_METHOD: &str = "query_balance_details";
 

src/main.rs

@@ -23,7 +23,6 @@ mod query_balance;
 mod query_balance_details;
 mod query_global_state;
 mod transaction;
-mod verify_contract;
 
 use std::process;
 
@@ -61,8 +60,6 @@ use query_global_state::QueryGlobalState;
 use transaction::{
     ListTransactions, MakeTransaction, PutTransaction, SendTransaction, SignTransaction,
 };
-use verify_contract::VerifyContract;
-
 const APP_NAME: &str = "Casper client";
 
 static VERSION: Lazy<String> =
@@ -117,7 +114,6 @@ enum DisplayOrder {
     Keygen,
     AccountAddress,
     GenerateCompletion,
-    VerifyContract,
 }
 
 fn cli() -> Command {
@@ -182,7 +178,6 @@ fn cli() -> Command {
         .subcommand(GenerateCompletion::build(
             DisplayOrder::GenerateCompletion as usize,
         ))
-        .subcommand(VerifyContract::build(DisplayOrder::VerifyContract as usize))
 }
 
 #[tokio::main(flavor = "current_thread")]
@@ -231,7 +226,6 @@ async fn main() {
         Keygen::NAME => Keygen::run(matches).await,
         AccountAddress::NAME => AccountAddress::run(matches).await,
         GenerateCompletion::NAME => GenerateCompletion::run(matches).await,
-        VerifyContract::NAME => VerifyContract::run(matches).await,
         _ => {
             let _ = cli().print_long_help();
             println!();