From 929450b967212ba8552c189408a197df28862618 Mon Sep 17 00:00:00 2001 From: Erwan Or Date: Wed, 25 Dec 2024 11:18:02 -0500 Subject: [PATCH] penumbra: fix incorrect replaces --- crates/bin/pcli/src/command/init.rs | 2 +- crates/bin/pcli/src/opt.rs | 2 +- crates/bin/pcli/tests/network_integration.rs | 2 +- .../bin/pclientd/tests/network_integration.rs | 4 +-- crates/bin/pd/src/cli.rs | 26 +++++++++---------- crates/bin/pd/tests/network_integration.rs | 6 ++--- .../app/src/action_handler/actions/submit.rs | 4 +-- crates/core/app/src/metrics.rs | 2 +- .../app/tests/app_blocktimes_increment.rs | 4 +-- ..._can_define_and_delegate_to_a_validator.rs | 4 +-- .../app_can_deposit_into_community_pool.rs | 4 +-- .../app_can_disable_community_pool_spends.rs | 2 +- .../app_can_propose_community_pool_spends.rs | 2 +- .../app_can_spend_notes_and_detect_outputs.rs | 4 +-- ...p_can_sweep_a_collection_of_small_notes.rs | 2 +- .../app_can_undelegate_from_a_validator.rs | 4 +-- crates/core/app/tests/app_check_dex_vcb.rs | 2 +- ...ator_definitions_with_invalid_auth_sigs.rs | 4 +-- .../app_reproduce_testnet_75_vcb_close.rs | 4 +-- ...me_for_genesis_validator_missing_blocks.rs | 4 +-- ...me_for_genesis_validator_signing_blocks.rs | 4 +-- ..._uptime_for_validators_only_once_active.rs | 4 +-- .../core/app/tests/common/ibc_tests/node.rs | 4 +-- .../core/app/tests/common/temp_storage_ext.rs | 4 +-- .../app/tests/common/test_node_builder_ext.rs | 6 ++--- .../app/tests/mock_consensus_block_proving.rs | 4 +-- ...onsensus_can_define_a_genesis_validator.rs | 4 +-- ...sus_can_send_a_sequence_of_empty_blocks.rs | 4 +-- crates/core/app/tests/spend.rs | 8 +++--- crates/core/app/tests/swap_and_swap_claim.rs | 6 ++--- .../view_server_can_be_served_on_localhost.rs | 4 +-- .../auction/src/component/metrics.rs | 2 +- .../core/component/governance/src/metrics.rs | 2 +- .../component/ibc/src/component/metrics.rs | 2 +- .../shielded-pool/src/component/metrics.rs | 2 +- crates/misc/measure/src/main.rs | 2 +- crates/view/src/metrics.rs | 2 +- 37 files changed, 76 insertions(+), 76 deletions(-) diff --git a/crates/bin/pcli/src/command/init.rs b/crates/bin/pcli/src/command/init.rs index 936a2d3788..51f74167c2 100644 --- a/crates/bin/pcli/src/command/init.rs +++ b/crates/bin/pcli/src/command/init.rs @@ -27,7 +27,7 @@ pub struct InitCmd { // pcli init inside of the test harness (where we override that) // will correctly set the URL, even though we don't subsequently // read it from the environment. - env = "penumbra_sdk_NODE_PD_URL", + env = "PENUMBRA_NODE_PD_URL", parse(try_from_str = Url::parse), )] grpc_url: Url, diff --git a/crates/bin/pcli/src/opt.rs b/crates/bin/pcli/src/opt.rs index 58bb27af36..0b88d6c6fa 100644 --- a/crates/bin/pcli/src/opt.rs +++ b/crates/bin/pcli/src/opt.rs @@ -26,7 +26,7 @@ pub struct Opt { #[clap(subcommand)] pub cmd: Command, /// The home directory used to store configuration and data. - #[clap(long, default_value_t = default_home(), env = "penumbra_sdk_PCLI_HOME")] + #[clap(long, default_value_t = default_home(), env = "PENUMBRA_PCLI_HOME")] pub home: Utf8PathBuf, /// Override the GRPC URL that will be used to connect to a fullnode. /// diff --git a/crates/bin/pcli/tests/network_integration.rs b/crates/bin/pcli/tests/network_integration.rs index 128a06c128..d3549415f3 100644 --- a/crates/bin/pcli/tests/network_integration.rs +++ b/crates/bin/pcli/tests/network_integration.rs @@ -3,7 +3,7 @@ //! These tests are marked with `#[ignore]`, but can be run with: //! `cargo test --package pcli -- --ignored --test-threads 1` //! -//! Tests against the network in the `penumbra_sdk_NODE_PD_URL` environment variable. +//! Tests against the network in the `PENUMBRA_NODE_PD_URL` environment variable. //! //! Tests assume that the initial state of the test account is after genesis, //! where no tokens have been delegated, and the address with index 0 diff --git a/crates/bin/pclientd/tests/network_integration.rs b/crates/bin/pclientd/tests/network_integration.rs index c4a783096c..3b28ae141b 100644 --- a/crates/bin/pclientd/tests/network_integration.rs +++ b/crates/bin/pclientd/tests/network_integration.rs @@ -1,6 +1,6 @@ //! Basic integration testing of `pclientd` versus a target testnet. //! -//! Tests against the network in the `penumbra_sdk_NODE_PD_URL` environment variable. +//! Tests against the network in the `PENUMBRA_NODE_PD_URL` environment variable. //! //! Tests assume that the initial state of the test account is after genesis, //! where no tokens have been delegated, and the address with index 0 @@ -34,7 +34,7 @@ use penumbra_sdk_view::ViewClient; fn generate_config() -> anyhow::Result { Ok(PclientdConfig { full_viewing_key: test_keys::FULL_VIEWING_KEY.clone(), - grpc_url: std::env::var("penumbra_sdk_NODE_PD_URL") + grpc_url: std::env::var("PENUMBRA_NODE_PD_URL") .unwrap_or_else(|_| "http://127.0.0.1:8080".to_owned()) .parse()?, bind_addr: "127.0.0.1:8081".parse()?, diff --git a/crates/bin/pd/src/cli.rs b/crates/bin/pd/src/cli.rs index 641117a245..d7ac2b2a1c 100644 --- a/crates/bin/pd/src/cli.rs +++ b/crates/bin/pd/src/cli.rs @@ -20,7 +20,7 @@ pub enum RootCommand { Start { /// The path used to store all `pd`-related data and configuration. /// If unset, defaults to ~/.penumbra/network_data/node0/pd. - #[clap(long, env = "penumbra_sdk_PD_HOME", display_order = 100)] + #[clap(long, env = "PENUMBRA_PD_HOME", display_order = 100)] home: Option, /// Bind the ABCI server to this socket. /// @@ -28,7 +28,7 @@ pub enum RootCommand { #[clap( short, long, - env = "penumbra_sdk_PD_ABCI_BIND", + env = "PENUMBRA_PD_ABCI_BIND", default_value = "127.0.0.1:26658", display_order = 400 )] @@ -41,7 +41,7 @@ pub enum RootCommand { /// If `grpc_auto_https` is set, this defaults to `0.0.0.0:443` and uses HTTPS. /// /// If `grpc_auto_https` is not set, this defaults to `127.0.0.1:8080` without HTTPS. - #[clap(short, long, env = "penumbra_sdk_PD_GRPC_BIND", display_order = 201)] + #[clap(short, long, env = "PENUMBRA_PD_GRPC_BIND", display_order = 201)] grpc_bind: Option, /// If set, serve gRPC using auto-managed HTTPS with this domain name. /// @@ -64,7 +64,7 @@ pub enum RootCommand { #[clap( short, long, - env = "penumbra_sdk_PD_METRICS_BIND", + env = "PENUMBRA_PD_METRICS_BIND", default_value = "127.0.0.1:9000", display_order = 300 )] @@ -79,7 +79,7 @@ pub enum RootCommand { #[clap( short, long, - env = "penumbra_sdk_PD_COMETBFT_PROXY_URL", + env = "PENUMBRA_PD_COMETBFT_PROXY_URL", default_value = "http://127.0.0.1:26657", display_order = 401, // Support old arg name for a while, as we migrate Tendermint -> CometBFT. @@ -104,7 +104,7 @@ pub enum RootCommand { /// Export the storage state the full node. Export { /// The home directory of the full node. - #[clap(long, env = "penumbra_sdk_PD_HOME", display_order = 100)] + #[clap(long, env = "PENUMBRA_PD_HOME", display_order = 100)] home: PathBuf, /// The directory where the exported node state will be written. #[clap(long, display_order = 200, alias = "export-path")] @@ -123,7 +123,7 @@ pub enum RootCommand { /// The home directory of the full node. /// /// Migration is performed in-place on the home directory. - #[clap(long, env = "penumbra_sdk_PD_HOME", display_order = 100)] + #[clap(long, env = "PENUMBRA_PD_HOME", display_order = 100)] home: Option, /// If set, also migrate the CometBFT state located in this home directory. /// If both `--home` and `--comet-home` are unset, will attempt to migrate @@ -218,17 +218,17 @@ pub enum NetworkCommand { /// Requires a URL for the CometBFT RPC for the bootstrap node. Join { /// URL of the remote CometBFT RPC endpoint for bootstrapping connection. - #[clap(env = "penumbra_sdk_PD_JOIN_URL")] + #[clap(env = "PENUMBRA_PD_JOIN_URL")] node: Url, /// Optional URL of archived node state in .tar.gz format. The archive will be /// downloaded and extracted locally, allowing the node to join a network at a block height /// higher than 0. Supports loading the archive from a local file, if set with file scheme /// explicitly, e.g. `file:///path/to/archive.tar.gz`. - #[clap(long, env = "penumbra_sdk_PD_ARCHIVE_URL")] + #[clap(long, env = "PENUMBRA_PD_ARCHIVE_URL")] archive_url: Option, /// Human-readable name to identify node on network // Default: 'node-#' - #[clap(long, env = "penumbra_sdk_PD_TM_MONIKER")] + #[clap(long, env = "PENUMBRA_PD_TM_EXTERNAL_ADDR")] moniker: Option, /// Public URL to advertise for this node's Tendermint P2P service. /// Setting this option will instruct other nodes on the network to connect @@ -238,19 +238,19 @@ pub enum NetworkCommand { /// When generating Tendermint config, use this socket to bind the Tendermint RPC service. #[clap( long, - env = "penumbra_sdk_PD_TM_RPC_BIND", + env = "PENUMBRA_PD_TM_RPC_BIND", default_value = "0.0.0.0:26657" )] tendermint_rpc_bind: SocketAddr, /// When generating Tendermint config, use this socket to bind the Tendermint P2P service. #[clap( long, - env = "penumbra_sdk_PD_TM_P2P_BIND", + env = "PENUMBRA_PD_TM_P2P_BIND", default_value = "0.0.0.0:26656" )] tendermint_p2p_bind: SocketAddr, /// Leave the downloaded archive file on disk after extraction. - #[clap(long, env = "penumbra_sdk_PD_LEAVE_ARCHIVE", action)] + #[clap(long, env = "PENUMBRA_PD_LEAVE_ARCHIVE", action)] leave_archive: bool, }, diff --git a/crates/bin/pd/tests/network_integration.rs b/crates/bin/pd/tests/network_integration.rs index c791ad6fe0..388c19caed 100644 --- a/crates/bin/pd/tests/network_integration.rs +++ b/crates/bin/pd/tests/network_integration.rs @@ -19,7 +19,7 @@ use url::Url; async fn check_cors_headers() -> anyhow::Result<()> { let client = reqwest::Client::new(); let pd_url = - std::env::var("penumbra_sdk_NODE_PD_URL").unwrap_or("http://localhost:8080".to_string()); + std::env::var("PENUMBRA_NODE_PD_URL").unwrap_or("http://localhost:8080".to_string()); let r = client.get(pd_url).send().await?; assert_eq!(r.headers().get("access-control-allow-origin").unwrap(), "*"); assert_eq!( @@ -39,7 +39,7 @@ async fn check_cors_headers() -> anyhow::Result<()> { async fn check_minifront_http_ok() -> anyhow::Result<()> { let client = reqwest::Client::new(); let pd_url = - std::env::var("penumbra_sdk_NODE_PD_URL").unwrap_or("http://localhost:8080".to_string()); + std::env::var("PENUMBRA_NODE_PD_URL").unwrap_or("http://localhost:8080".to_string()); let r = client.get(pd_url).send().await?; assert_eq!(r.status(), StatusCode::OK); Ok(()) @@ -50,7 +50,7 @@ async fn check_minifront_http_ok() -> anyhow::Result<()> { /// Validate that gRPC server reflection is enabled and working, by calling out /// to `grpcurl` and verifying that it can view methods. See GH4392 for context. async fn check_grpc_server_reflection() -> anyhow::Result<()> { - let pd_url: Url = std::env::var("penumbra_sdk_NODE_PD_URL") + let pd_url: Url = std::env::var("PENUMBRA_NODE_PD_URL") .unwrap_or("http://localhost:8080".to_string()) .parse() .unwrap(); diff --git a/crates/core/app/src/action_handler/actions/submit.rs b/crates/core/app/src/action_handler/actions/submit.rs index 1fce55ead0..f6abb3b636 100644 --- a/crates/core/app/src/action_handler/actions/submit.rs +++ b/crates/core/app/src/action_handler/actions/submit.rs @@ -310,8 +310,8 @@ impl AppActionHandler for ProposalSubmit { /// hashes of two arbitrary strings. static COMMUNITY_POOL_FULL_VIEWING_KEY: Lazy = Lazy::new(|| { // We start with two different personalization strings for the hash function: - let ak_personalization = b"penumbra_sdk_CP_ak"; - let nk_personalization = b"penumbra_sdk_CP_nk"; + let ak_personalization = b"Penumbra_CP_ak"; + let nk_personalization = b"Penumbra_CP_nk"; // We pick two different arbitrary strings to hash: let ak_hash_input = diff --git a/crates/core/app/src/metrics.rs b/crates/core/app/src/metrics.rs index a3d10728b6..ebe673927b 100644 --- a/crates/core/app/src/metrics.rs +++ b/crates/core/app/src/metrics.rs @@ -31,4 +31,4 @@ pub fn register_metrics() { ); } -pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_sdk_pd_mempool_checktx_total"; +pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_pd_mempool_checktx_total"; diff --git a/crates/core/app/tests/app_blocktimes_increment.rs b/crates/core/app/tests/app_blocktimes_increment.rs index 268926d95e..35c8d112a7 100644 --- a/crates/core/app/tests/app_blocktimes_increment.rs +++ b/crates/core/app/tests/app_blocktimes_increment.rs @@ -32,7 +32,7 @@ async fn mock_tendermint_block_times_correct() -> anyhow::Result<()> { // This should use the default time callback of 5s TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .with_initial_timestamp(start_time) .init_chain(consensus) .await @@ -67,7 +67,7 @@ async fn mock_tendermint_block_times_correct() -> anyhow::Result<()> { // This should use the default time callback of 5s TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .with_initial_timestamp(start_time) // Set a callback to add 13 seconds instead .ts_callback(move |t| t.checked_add(block_duration).unwrap()) diff --git a/crates/core/app/tests/app_can_define_and_delegate_to_a_validator.rs b/crates/core/app/tests/app_can_define_and_delegate_to_a_validator.rs index 4aa6971582..6e11d0bdd7 100644 --- a/crates/core/app/tests/app_can_define_and_delegate_to_a_validator.rs +++ b/crates/core/app/tests/app_can_define_and_delegate_to_a_validator.rs @@ -33,7 +33,7 @@ const EPOCH_DURATION: u64 = 8; async fn app_can_define_and_delegate_to_a_validator() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Configure an AppState with slightly shorter epochs than usual. let app_state = AppState::Content( @@ -47,7 +47,7 @@ async fn app_can_define_and_delegate_to_a_validator() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_can_deposit_into_community_pool.rs b/crates/core/app/tests/app_can_deposit_into_community_pool.rs index a3df8ec73a..9994fc0269 100644 --- a/crates/core/app/tests/app_can_deposit_into_community_pool.rs +++ b/crates/core/app/tests/app_can_deposit_into_community_pool.rs @@ -29,7 +29,7 @@ mod common; async fn app_can_deposit_into_community_pool() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Define our application state, and start the test node. let mut test_node = { @@ -39,7 +39,7 @@ async fn app_can_deposit_into_community_pool() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await .tap_ok(|e| tracing::info!(hash = %e.last_app_hash_hex(), "finished init chain"))? diff --git a/crates/core/app/tests/app_can_disable_community_pool_spends.rs b/crates/core/app/tests/app_can_disable_community_pool_spends.rs index 9fd55f8df5..7379ce71a0 100644 --- a/crates/core/app/tests/app_can_disable_community_pool_spends.rs +++ b/crates/core/app/tests/app_can_disable_community_pool_spends.rs @@ -50,7 +50,7 @@ const PROPOSAL_VOTING_BLOCKS: u64 = 3; async fn app_can_disable_community_pool_spends() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Define a helper to get the current community pool balance. let pool_balance = || async { storage.latest_snapshot().community_pool_balance().await }; diff --git a/crates/core/app/tests/app_can_propose_community_pool_spends.rs b/crates/core/app/tests/app_can_propose_community_pool_spends.rs index 2bbaa0d41c..e7f0db8b69 100644 --- a/crates/core/app/tests/app_can_propose_community_pool_spends.rs +++ b/crates/core/app/tests/app_can_propose_community_pool_spends.rs @@ -50,7 +50,7 @@ const PROPOSAL_VOTING_BLOCKS: u64 = 3; async fn app_can_propose_community_pool_spends() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Define a helper to get the current community pool balance. let pool_balance = || async { storage.latest_snapshot().community_pool_balance().await }; diff --git a/crates/core/app/tests/app_can_spend_notes_and_detect_outputs.rs b/crates/core/app/tests/app_can_spend_notes_and_detect_outputs.rs index c7490c2e9c..487227f974 100644 --- a/crates/core/app/tests/app_can_spend_notes_and_detect_outputs.rs +++ b/crates/core/app/tests/app_can_spend_notes_and_detect_outputs.rs @@ -28,7 +28,7 @@ mod common; async fn app_can_spend_notes_and_detect_outputs() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; let mut test_node = { let app_state = AppState::Content( genesis::Content::default().with_chain_id(TestNode::<()>::CHAIN_ID.to_string()), @@ -36,7 +36,7 @@ async fn app_can_spend_notes_and_detect_outputs() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await .tap_ok(|e| tracing::info!(hash = %e.last_app_hash_hex(), "finished init chain"))? diff --git a/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs b/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs index 272ce6bd63..a32fd032aa 100644 --- a/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs +++ b/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs @@ -38,7 +38,7 @@ const COUNT: usize = SWEEP_COUNT + 1; async fn app_can_sweep_a_collection_of_small_notes() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = common::set_tracing_subscriber_with_env_filter("info".into()); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Instantiate a mock tendermint proxy, which we will connect to the test node. let proxy = penumbra_sdk_mock_tendermint_proxy::TestNodeProxy::new::(); diff --git a/crates/core/app/tests/app_can_undelegate_from_a_validator.rs b/crates/core/app/tests/app_can_undelegate_from_a_validator.rs index 27b79aadad..739493bd9e 100644 --- a/crates/core/app/tests/app_can_undelegate_from_a_validator.rs +++ b/crates/core/app/tests/app_can_undelegate_from_a_validator.rs @@ -40,7 +40,7 @@ const UNBONDING_DELAY: u64 = 4; async fn app_can_undelegate_from_a_validator() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Helper function to get the latest block height. let get_latest_height = || async { @@ -73,7 +73,7 @@ async fn app_can_undelegate_from_a_validator() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_check_dex_vcb.rs b/crates/core/app/tests/app_check_dex_vcb.rs index 32fe84b610..5eece0d73b 100644 --- a/crates/core/app/tests/app_check_dex_vcb.rs +++ b/crates/core/app/tests/app_check_dex_vcb.rs @@ -25,7 +25,7 @@ use std::{ops::Deref, sync::Arc}; /// This bug was fixed in #4643. async fn dex_vcb_tracks_multiswap() -> anyhow::Result<()> { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1776); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await? .apply_default_genesis() .await?; diff --git a/crates/core/app/tests/app_rejects_validator_definitions_with_invalid_auth_sigs.rs b/crates/core/app/tests/app_rejects_validator_definitions_with_invalid_auth_sigs.rs index 5a21812af9..d09178db42 100644 --- a/crates/core/app/tests/app_rejects_validator_definitions_with_invalid_auth_sigs.rs +++ b/crates/core/app/tests/app_rejects_validator_definitions_with_invalid_auth_sigs.rs @@ -24,7 +24,7 @@ mod common; async fn app_rejects_validator_definitions_with_invalid_auth_sigs() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Start the test node. let mut node = { @@ -34,7 +34,7 @@ async fn app_rejects_validator_definitions_with_invalid_auth_sigs() -> anyhow::R ); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_reproduce_testnet_75_vcb_close.rs b/crates/core/app/tests/app_reproduce_testnet_75_vcb_close.rs index 0f20fb5b5a..2262df1a15 100644 --- a/crates/core/app/tests/app_reproduce_testnet_75_vcb_close.rs +++ b/crates/core/app/tests/app_reproduce_testnet_75_vcb_close.rs @@ -66,7 +66,7 @@ async fn app_can_reproduce_tesnet_75_vcb_close() -> anyhow::Result<()> { common::set_tracing_subscriber_with_env_filter(filter) }; - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; let app_state = AppState::Content( genesis::Content::default().with_chain_id(TestNode::<()>::CHAIN_ID.to_string()), ); @@ -75,7 +75,7 @@ async fn app_can_reproduce_tesnet_75_vcb_close() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_missing_blocks.rs b/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_missing_blocks.rs index 6a299409dc..6ed014bf77 100644 --- a/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_missing_blocks.rs +++ b/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_missing_blocks.rs @@ -19,7 +19,7 @@ mod common; async fn app_tracks_uptime_for_genesis_validator_missing_blocks() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Start the test node. let mut node = { @@ -29,7 +29,7 @@ async fn app_tracks_uptime_for_genesis_validator_missing_blocks() -> anyhow::Res let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_signing_blocks.rs b/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_signing_blocks.rs index de5f637c33..ee5ef2e29f 100644 --- a/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_signing_blocks.rs +++ b/crates/core/app/tests/app_tracks_uptime_for_genesis_validator_signing_blocks.rs @@ -19,7 +19,7 @@ mod common; async fn app_tracks_uptime_for_genesis_validator_missing_blocks() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Start the test node. let mut node = { @@ -29,7 +29,7 @@ async fn app_tracks_uptime_for_genesis_validator_missing_blocks() -> anyhow::Res let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/app_tracks_uptime_for_validators_only_once_active.rs b/crates/core/app/tests/app_tracks_uptime_for_validators_only_once_active.rs index 6ed4cc4d34..85c3806bbd 100644 --- a/crates/core/app/tests/app_tracks_uptime_for_validators_only_once_active.rs +++ b/crates/core/app/tests/app_tracks_uptime_for_validators_only_once_active.rs @@ -33,7 +33,7 @@ async fn app_tracks_uptime_for_validators_only_once_active() -> anyhow::Result<( // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Configure an AppState with slightly shorter epochs than usual. let app_state = AppState::Content( @@ -47,7 +47,7 @@ async fn app_tracks_uptime_for_validators_only_once_active() -> anyhow::Result<( let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await }?; diff --git a/crates/core/app/tests/common/ibc_tests/node.rs b/crates/core/app/tests/common/ibc_tests/node.rs index 7ae02619d2..b1fdaecced 100644 --- a/crates/core/app/tests/common/ibc_tests/node.rs +++ b/crates/core/app/tests/common/ibc_tests/node.rs @@ -78,7 +78,7 @@ impl TestNodeWithIBC { ) -> Result { let chain_id = format!("{}-{}", TestNode::<()>::CHAIN_ID, suffix); // Use the correct substores - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Instantiate a mock tendermint proxy, which we will connect to the test node. let proxy = penumbra_sdk_mock_tendermint_proxy::TestNodeProxy::new::(); @@ -90,7 +90,7 @@ impl TestNodeWithIBC { .with_keys(vec![keys]) .single_validator() .with_initial_timestamp(start_time) - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .on_block(proxy.on_block_callback()) .init_chain(consensus) .await diff --git a/crates/core/app/tests/common/temp_storage_ext.rs b/crates/core/app/tests/common/temp_storage_ext.rs index be1483313a..bc93e826d8 100644 --- a/crates/core/app/tests/common/temp_storage_ext.rs +++ b/crates/core/app/tests/common/temp_storage_ext.rs @@ -10,12 +10,12 @@ pub trait TempStorageExt: Sized { async fn apply_genesis(self, genesis: AppState) -> anyhow::Result; #[allow(dead_code)] async fn apply_default_genesis(self) -> anyhow::Result; - async fn new_with_penumbra_sdk_prefixes() -> anyhow::Result; + async fn new_with_penumbra_prefixes() -> anyhow::Result; } #[async_trait] impl TempStorageExt for TempStorage { - async fn new_with_penumbra_sdk_prefixes() -> anyhow::Result { + async fn new_with_penumbra_prefixes() -> anyhow::Result { TempStorage::new_with_prefixes(SUBSTORE_PREFIXES.to_vec()).await } diff --git a/crates/core/app/tests/common/test_node_builder_ext.rs b/crates/core/app/tests/common/test_node_builder_ext.rs index f2f9aa4f6b..51eaf19247 100644 --- a/crates/core/app/tests/common/test_node_builder_ext.rs +++ b/crates/core/app/tests/common/test_node_builder_ext.rs @@ -16,17 +16,17 @@ use { /// Penumbra-specific extensions to the mock consensus builder. pub trait BuilderExt: Sized { - /// The error thrown by [`with_penumbra_sdk_auto_app_state`] + /// The error thrown by [`with_penumbra_auto_app_state`] type Error; /// Add the provided Penumbra [`AppState`] to the builder. /// /// This will inject any configured validators into the state before serializing it into bytes. - fn with_penumbra_sdk_auto_app_state(self, app_state: AppState) -> Result; + fn with_penumbra_auto_app_state(self, app_state: AppState) -> Result; } impl BuilderExt for Builder { type Error = anyhow::Error; - fn with_penumbra_sdk_auto_app_state( + fn with_penumbra_auto_app_state( mut self, app_state: AppState, ) -> Result { diff --git a/crates/core/app/tests/mock_consensus_block_proving.rs b/crates/core/app/tests/mock_consensus_block_proving.rs index 3c58973c84..831117f368 100644 --- a/crates/core/app/tests/mock_consensus_block_proving.rs +++ b/crates/core/app/tests/mock_consensus_block_proving.rs @@ -48,7 +48,7 @@ async fn verify_storage_proof_simple() -> anyhow::Result<()> { // Install a test logger, and acquire some temporary storage. let guard = set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; let start_time = tendermint::Time::parse_from_rfc3339("2022-02-11T17:30:50.425417198Z")?; @@ -61,7 +61,7 @@ async fn verify_storage_proof_simple() -> anyhow::Result<()> { // let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .on_block(proxy.on_block_callback()) .init_chain(consensus) .await diff --git a/crates/core/app/tests/mock_consensus_can_define_a_genesis_validator.rs b/crates/core/app/tests/mock_consensus_can_define_a_genesis_validator.rs index a3f40e26b3..7429e93438 100644 --- a/crates/core/app/tests/mock_consensus_can_define_a_genesis_validator.rs +++ b/crates/core/app/tests/mock_consensus_can_define_a_genesis_validator.rs @@ -20,7 +20,7 @@ mod common; async fn mock_consensus_can_define_a_genesis_validator() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; let test_node = { let app_state = AppState::Content( genesis::Content::default().with_chain_id(TestNode::<()>::CHAIN_ID.to_string()), @@ -28,7 +28,7 @@ async fn mock_consensus_can_define_a_genesis_validator() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await .tap_ok(|e| tracing::info!(hash = %e.last_app_hash_hex(), "finished init chain"))? diff --git a/crates/core/app/tests/mock_consensus_can_send_a_sequence_of_empty_blocks.rs b/crates/core/app/tests/mock_consensus_can_send_a_sequence_of_empty_blocks.rs index 12e5c904d7..ac55d3bd3e 100644 --- a/crates/core/app/tests/mock_consensus_can_send_a_sequence_of_empty_blocks.rs +++ b/crates/core/app/tests/mock_consensus_can_send_a_sequence_of_empty_blocks.rs @@ -19,7 +19,7 @@ mod common; async fn mock_consensus_can_send_a_sequence_of_empty_blocks() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; let mut test_node = { let app_state = AppState::Content( genesis::Content::default().with_chain_id(TestNode::<()>::CHAIN_ID.to_string()), @@ -27,7 +27,7 @@ async fn mock_consensus_can_send_a_sequence_of_empty_blocks() -> anyhow::Result< let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .init_chain(consensus) .await .tap_ok(|e| tracing::info!(hash = %e.last_app_hash_hex(), "finished init chain"))? diff --git a/crates/core/app/tests/spend.rs b/crates/core/app/tests/spend.rs index 890d799e1d..bbdba236a6 100644 --- a/crates/core/app/tests/spend.rs +++ b/crates/core/app/tests/spend.rs @@ -26,7 +26,7 @@ use tendermint::abci; async fn spend_happy_path() -> anyhow::Result<()> { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await? .apply_default_genesis() .await?; @@ -105,7 +105,7 @@ async fn spend_happy_path() -> anyhow::Result<()> { async fn invalid_dummy_spend() { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await .unwrap() .apply_default_genesis() @@ -206,7 +206,7 @@ async fn invalid_dummy_spend() { async fn spend_duplicate_nullifier_previous_transaction() { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await .expect("can start new temp storage") .apply_default_genesis() @@ -297,7 +297,7 @@ async fn spend_duplicate_nullifier_previous_transaction() { async fn spend_duplicate_nullifier_same_transaction() { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await .expect("can start new temp storage") .apply_default_genesis() diff --git a/crates/core/app/tests/swap_and_swap_claim.rs b/crates/core/app/tests/swap_and_swap_claim.rs index 56e571dc59..6d24d949bb 100644 --- a/crates/core/app/tests/swap_and_swap_claim.rs +++ b/crates/core/app/tests/swap_and_swap_claim.rs @@ -30,7 +30,7 @@ use tendermint::abci; async fn swap_and_swap_claim() -> anyhow::Result<()> { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await? .apply_default_genesis() .await?; @@ -144,7 +144,7 @@ async fn swap_and_swap_claim() -> anyhow::Result<()> { async fn swap_claim_duplicate_nullifier_previous_transaction() { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await .unwrap() .apply_default_genesis() @@ -270,7 +270,7 @@ async fn swap_claim_duplicate_nullifier_previous_transaction() { async fn swap_with_nonzero_fee() -> anyhow::Result<()> { let mut rng = rand_chacha::ChaChaRng::seed_from_u64(1312); - let storage = TempStorage::new_with_penumbra_sdk_prefixes() + let storage = TempStorage::new_with_penumbra_prefixes() .await? .apply_default_genesis() .await?; diff --git a/crates/core/app/tests/view_server_can_be_served_on_localhost.rs b/crates/core/app/tests/view_server_can_be_served_on_localhost.rs index afbbbd394a..501f3bd2d8 100644 --- a/crates/core/app/tests/view_server_can_be_served_on_localhost.rs +++ b/crates/core/app/tests/view_server_can_be_served_on_localhost.rs @@ -31,7 +31,7 @@ mod common; async fn view_server_can_be_served_on_localhost() -> anyhow::Result<()> { // Install a test logger, acquire some temporary storage, and start the test node. let guard = common::set_tracing_subscriber(); - let storage = TempStorage::new_with_penumbra_sdk_prefixes().await?; + let storage = TempStorage::new_with_penumbra_prefixes().await?; // Instantiate a mock tendermint proxy, which we will connect to the test node. let proxy = penumbra_sdk_mock_tendermint_proxy::TestNodeProxy::new::(); @@ -44,7 +44,7 @@ async fn view_server_can_be_served_on_localhost() -> anyhow::Result<()> { let consensus = Consensus::new(storage.as_ref().clone()); TestNode::builder() .single_validator() - .with_penumbra_sdk_auto_app_state(app_state)? + .with_penumbra_auto_app_state(app_state)? .on_block(proxy.on_block_callback()) .init_chain(consensus) .await diff --git a/crates/core/component/auction/src/component/metrics.rs b/crates/core/component/auction/src/component/metrics.rs index bf7cc1df9f..3d73682b5f 100644 --- a/crates/core/component/auction/src/component/metrics.rs +++ b/crates/core/component/auction/src/component/metrics.rs @@ -22,4 +22,4 @@ pub fn register_metrics() { // ); } -// pub const SOMETHING_TO_MEASURE: &str = "penumbra_sdk_auction_something_to_measure"; +// pub const SOMETHING_TO_MEASURE: &str = "penumbra_auction_something_to_measure"; diff --git a/crates/core/component/governance/src/metrics.rs b/crates/core/component/governance/src/metrics.rs index aff73c3131..668c4d13b5 100644 --- a/crates/core/component/governance/src/metrics.rs +++ b/crates/core/component/governance/src/metrics.rs @@ -27,4 +27,4 @@ pub fn register_metrics() { } // Sample code for reference -- delete when adding the first metric -// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_sdk_pd_mempool_checktx_total"; +// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_pd_mempool_checktx_total"; diff --git a/crates/core/component/ibc/src/component/metrics.rs b/crates/core/component/ibc/src/component/metrics.rs index aff73c3131..668c4d13b5 100644 --- a/crates/core/component/ibc/src/component/metrics.rs +++ b/crates/core/component/ibc/src/component/metrics.rs @@ -27,4 +27,4 @@ pub fn register_metrics() { } // Sample code for reference -- delete when adding the first metric -// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_sdk_pd_mempool_checktx_total"; +// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_pd_mempool_checktx_total"; diff --git a/crates/core/component/shielded-pool/src/component/metrics.rs b/crates/core/component/shielded-pool/src/component/metrics.rs index aff73c3131..668c4d13b5 100644 --- a/crates/core/component/shielded-pool/src/component/metrics.rs +++ b/crates/core/component/shielded-pool/src/component/metrics.rs @@ -27,4 +27,4 @@ pub fn register_metrics() { } // Sample code for reference -- delete when adding the first metric -// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_sdk_pd_mempool_checktx_total"; +// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_pd_mempool_checktx_total"; diff --git a/crates/misc/measure/src/main.rs b/crates/misc/measure/src/main.rs index 462f7856e6..c7a24ae615 100644 --- a/crates/misc/measure/src/main.rs +++ b/crates/misc/measure/src/main.rs @@ -39,7 +39,7 @@ pub struct Opt { #[clap( short, long, - env = "penumbra_sdk_NODE_PD_URL", + env = "PENUMBRA_NODE_PD_URL", parse(try_from_str = url::Url::parse) )] node: Url, diff --git a/crates/view/src/metrics.rs b/crates/view/src/metrics.rs index aff73c3131..668c4d13b5 100644 --- a/crates/view/src/metrics.rs +++ b/crates/view/src/metrics.rs @@ -27,4 +27,4 @@ pub fn register_metrics() { } // Sample code for reference -- delete when adding the first metric -// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_sdk_pd_mempool_checktx_total"; +// pub const MEMPOOL_CHECKTX_TOTAL: &str = "penumbra_pd_mempool_checktx_total";