Skip to content

Commit

Permalink
Merge branch 'tiago/downgrade-nightly-toolchain' (#2761)
Browse files Browse the repository at this point in the history
* tiago/downgrade-nightly-toolchain:
  Changelog for #2761
  Appease clippy
  Downgrade nightly toolchain to `2024-02-10`
  • Loading branch information
tzemanovic committed Feb 28, 2024
2 parents 6c84663 + 6c5f43e commit da17d6f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Downgrade nightly toolchain to `2024-02-10`.
([\#2761](https://github.com/anoma/namada/pull/2761))
6 changes: 2 additions & 4 deletions crates/apps/src/lib/client/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ pub async fn join_network(
});

// Try to find validator data when using a pre-genesis validator
let validator_alias = validator_alias_and_pre_genesis_wallet
.as_ref()
.map(|(alias, _wallet)| alias.clone());
let validator_keys = validator_alias_and_pre_genesis_wallet.as_ref().map(
|(_alias, wallet)| {
let tendermint_node_key: common::SecretKey =
Expand All @@ -247,7 +244,8 @@ pub async fn join_network(
(tendermint_node_key, consensus_key)
},
);
let node_mode = if validator_alias.is_some() {
let is_validator = validator_alias_and_pre_genesis_wallet.is_some();
let node_mode = if is_validator {
TendermintMode::Validator
} else {
TendermintMode::Full
Expand Down
3 changes: 1 addition & 2 deletions crates/tests/src/vm_host_env/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ use crate::vp::TestVpEnv;
static mut CTX: Ctx = unsafe { Ctx::new() };

/// Tx execution context provides access to host env functions
#[allow(static_mut_refs)]
pub fn ctx() -> &'static mut Ctx {
unsafe { &mut CTX }
unsafe { &mut *std::ptr::addr_of_mut!(CTX) }
}

/// This module combines the native host function implementations from
Expand Down
2 changes: 1 addition & 1 deletion rust-nightly-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2024-02-20
nightly-2024-02-10

0 comments on commit da17d6f

Please sign in to comment.