Skip to content

Commit

Permalink
bump rust version and run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
mkaczanowski committed Nov 15, 2024
1 parent 67d61d5 commit b3ca551
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
matrix:
toolchain:
- stable
- 1.72.0 # MSRV
- 1.74.0 # MSRV
runs-on: ubuntu-latest
steps:
- name: Checkout sources
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
matrix:
toolchain:
- stable
- 1.72.0 # MSRV
- 1.74.0 # MSRV
runs-on: ubuntu-latest
steps:
- name: Checkout sources
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.72.0 # MSRV
toolchain: 1.74.0 # MSRV
override: true

- name: Install libudev-dev
Expand Down
9 changes: 3 additions & 6 deletions src/keyring/providers/hashicorp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ pub(crate) mod vault_client;

use crate::{
chain,
config::provider::{
hashicorp::HashiCorpConfig,
KeyType,
},
config::provider::{hashicorp::HashiCorpConfig, KeyType},
error::{Error, ErrorKind::*},
keyring::{
ed25519::{self, Signer},
Expand Down Expand Up @@ -76,8 +73,8 @@ pub fn init(
)
});

let public_key =
ed25519::VerifyingKey::try_from(public_key.as_slice()).unwrap_or_else(|_| {
let public_key = ed25519::VerifyingKey::try_from(public_key.as_slice())
.unwrap_or_else(|_| {
panic!(
"invalid Ed25519 public key for chain id:{}",
key_config.chain_id
Expand Down
2 changes: 1 addition & 1 deletion src/keyring/providers/hashicorp/client.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::error::Error;
use crate::config::provider::hashicorp::VaultEndpointConfig;
use crate::keyring::ed25519;
use crate::keyring::providers::hashicorp::vault_client::{CreateKeyType, VaultClient};
use crate::config::provider::hashicorp::VaultEndpointConfig;
use abscissa_core::prelude::*;

pub(crate) struct TendermintValidatorApp {
Expand Down
2 changes: 1 addition & 1 deletion src/keyring/providers/hashicorp/vault_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use super::error::Error;
use std::time::Duration;
use ureq::Agent;

use crate::config::provider::hashicorp::VaultEndpointConfig;
use crate::keyring::ed25519;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use crate::config::provider::hashicorp::VaultEndpointConfig;

use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
use rustls::pki_types::{pem::PemObject, CertificateDer, ServerName, UnixTime};
Expand Down

0 comments on commit b3ca551

Please sign in to comment.