Replace deprecated code

This commit is contained in:
dynco-nym
2024-08-29 01:22:51 +02:00
parent 9378100957
commit 3635cbdc8d
2 changed files with 4 additions and 3 deletions
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
use crate::nyxd::error::NyxdError;
use base64::Engine;
use cosmrs::abci::TxMsgData;
use cosmrs::cosmwasm::MsgExecuteContractResponse;
use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
@@ -16,7 +17,7 @@ pub fn parse_msg_responses(data: Bytes) -> Vec<MsgResponse> {
// it seems that currently, on wasmd 0.43 + tendermint-rs 0.37 + cosmrs 0.17.0-pre
// the data is left in undecoded base64 form, but I'd imagine this might change so if the decoding fails,
// use the bytes directly instead
let data = if let Ok(decoded) = base64::decode(&data) {
let data = if let Ok(decoded) = base64::prelude::BASE64_STANDARD.decode(&data) {
decoded
} else {
error!("failed to base64-decode the 'data' field of the TxResponse - has the chain been upgraded and introduced some breaking changes?");
@@ -3,6 +3,7 @@
use crate::rpc::TendermintRpcClient;
use async_trait::async_trait;
use base64::Engine;
use cosmrs::tendermint::{block::Height, evidence::Evidence, Hash};
use reqwest::header::HeaderMap;
use reqwest::{header, RequestBuilder};
@@ -13,7 +14,6 @@ use tendermint_rpc::{
query::Query,
Error, Order, Response, SimpleRequest,
};
use url::Url;
// copied macro from tendermint-rpc crate because that's exactly what we have to do here too
@@ -206,7 +206,7 @@ pub fn extract_authorization(url: &Url) -> Option<String> {
let authority = url.authority();
if let Some((userpass, _)) = authority.split_once('@') {
Some(base64::encode(userpass))
Some(base64::prelude::BASE64_STANDARD.encode(userpass))
} else {
None
}