From 536897731093486905ef909792163d6b736d4bbc Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Fri, 26 Jul 2024 11:47:26 +0200 Subject: [PATCH] remove temp code --- .../minotari_merge_mining_proxy/src/proxy.rs | 19 ++++++------------- .../src/tari_address/dual_address.rs | 17 ++++------------- .../common_types/src/tari_address/mod.rs | 17 +++-------------- .../src/tari_address/single_address.rs | 17 ++++------------- common/src/build/application.rs | 17 +++++------------ 5 files changed, 22 insertions(+), 65 deletions(-) diff --git a/applications/minotari_merge_mining_proxy/src/proxy.rs b/applications/minotari_merge_mining_proxy/src/proxy.rs index 117e30a9e1..c0d76cca54 100644 --- a/applications/minotari_merge_mining_proxy/src/proxy.rs +++ b/applications/minotari_merge_mining_proxy/src/proxy.rs @@ -24,7 +24,6 @@ use std::{ cmp, convert::TryInto, future::Future, - panic, pin::Pin, sync::{ atomic::{AtomicBool, Ordering}, @@ -649,18 +648,12 @@ impl InnerService { .iter() .position(|x| x == &last_used_url) .unwrap_or(0); - // replace after rust stable 1.80 release - // let (left, right) = self - // .config - // .monerod_url - // .split_at_checked(pos) - // .ok_or(MmProxyError::ConversionError("Invalid utf 8 url".to_string()))?; - let url = self.config.monerod_url.clone(); - let result = panic::catch_unwind(|| url.split_at(pos)); - let (left, right) = match result { - Ok((left, right)) => (left, right), - Err(_) => return Err(MmProxyError::ConversionError("Invalid utf 8 url".to_string())), - }; + + let (left, right) = self + .config + .monerod_url + .split_at_checked(pos) + .ok_or(MmProxyError::ConversionError("Invalid utf 8 url".to_string()))?; let left = left.to_vec(); let right = right.to_vec(); let iter = right.iter().chain(left.iter()).chain(right.iter()).chain(left.iter()); diff --git a/base_layer/common_types/src/tari_address/dual_address.rs b/base_layer/common_types/src/tari_address/dual_address.rs index 8706f0a7a1..7f51610f93 100644 --- a/base_layer/common_types/src/tari_address/dual_address.rs +++ b/base_layer/common_types/src/tari_address/dual_address.rs @@ -20,7 +20,7 @@ // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -use std::{convert::TryFrom, panic}; +use std::convert::TryFrom; use serde::{Deserialize, Serialize}; use tari_common::configuration::Network; @@ -168,18 +168,9 @@ impl DualAddress { if hex_str.len() < INTERNAL_DUAL_BASE58_MIN_SIZE || hex_str.len() > INTERNAL_DUAL_BASE58_MAX_SIZE { return Err(TariAddressError::InvalidSize); } - let result = panic::catch_unwind(|| hex_str.split_at(2)); - let (first, rest) = match result { - Ok((first, rest)) => (first, rest), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - let result = panic::catch_unwind(|| first.split_at(1)); - let (network, features) = match result { - Ok((network, features)) => (network, features), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - // let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; - // let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; + + let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; + let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; let mut result = bs58::decode(network) .into_vec() .map_err(|_| TariAddressError::CannotRecoverNetwork)?; diff --git a/base_layer/common_types/src/tari_address/mod.rs b/base_layer/common_types/src/tari_address/mod.rs index 71d12ab9e0..27795af58d 100644 --- a/base_layer/common_types/src/tari_address/mod.rs +++ b/base_layer/common_types/src/tari_address/mod.rs @@ -26,7 +26,6 @@ mod single_address; use std::{ fmt, fmt::{Display, Error, Formatter}, - panic, str::FromStr, }; @@ -253,19 +252,9 @@ impl TariAddress { if hex_str.len() < INTERNAL_SINGLE_MIN_BASE58_SIZE { return Err(TariAddressError::InvalidSize); } - let result = panic::catch_unwind(|| hex_str.split_at(2)); - let (first, rest) = match result { - Ok((first, rest)) => (first, rest), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - let result = panic::catch_unwind(|| first.split_at(1)); - let (network, features) = match result { - Ok((network, features)) => (network, features), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - // replace this after 1.80 stable - // let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; - // let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; + + let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; + let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; let mut result = bs58::decode(network) .into_vec() .map_err(|_| TariAddressError::CannotRecoverNetwork)?; diff --git a/base_layer/common_types/src/tari_address/single_address.rs b/base_layer/common_types/src/tari_address/single_address.rs index b4cc8f2483..4bb527a176 100644 --- a/base_layer/common_types/src/tari_address/single_address.rs +++ b/base_layer/common_types/src/tari_address/single_address.rs @@ -20,7 +20,7 @@ // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -use std::{convert::TryFrom, panic}; +use std::convert::TryFrom; use serde::{Deserialize, Serialize}; use tari_common::configuration::Network; @@ -151,18 +151,9 @@ impl SingleAddress { if hex_str.len() < INTERNAL_SINGLE_MIN_BASE58_SIZE || hex_str.len() > INTERNAL_SINGLE_MAX_BASE58_SIZE { return Err(TariAddressError::InvalidSize); } - let result = panic::catch_unwind(|| hex_str.split_at(2)); - let (first, rest) = match result { - Ok((first, rest)) => (first, rest), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - let result = panic::catch_unwind(|| first.split_at(1)); - let (network, features) = match result { - Ok((network, features)) => (network, features), - Err(_) => return Err(TariAddressError::InvalidCharacter), - }; - // let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; - // let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; + + let (first, rest) = hex_str.split_at_checked(2).ok_or(TariAddressError::InvalidCharacter)?; + let (network, features) = first.split_at_checked(1).ok_or(TariAddressError::InvalidCharacter)?; let mut result = bs58::decode(network) .into_vec() .map_err(|_| TariAddressError::CannotRecoverNetwork)?; diff --git a/common/src/build/application.rs b/common/src/build/application.rs index 612829cacc..386ae4719d 100644 --- a/common/src/build/application.rs +++ b/common/src/build/application.rs @@ -25,7 +25,6 @@ use std::{ fmt, fs, io::Write, - panic, path::{Path, PathBuf}, }; @@ -129,17 +128,11 @@ fn get_commit() -> Result { let repo = git2::Repository::open(git_root)?; let head = repo.revparse_single("HEAD")?; let id = format!("{:?}", head.id()); - let result = panic::catch_unwind(|| id.split_at(7)); - let id = match result { - Ok((first, _)) => first.to_string(), - Err(_) => return Err(anyhow::anyhow!("invalid utf8 in commit id")), - }; - - // replace after stable 1.80 release - // id.split_at_checked(7) - // .ok_or(anyhow::anyhow!("invalid utf8 in commit id"))? - // .0 - // .to_string(); + + id.split_at_checked(7) + .ok_or(anyhow::anyhow!("invalid utf8 in commit id"))? + .0 + .to_string(); Ok(id) }