Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade nightly toolchain #2761

Merged
merged 3 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading