Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
SWvheerden committed Feb 27, 2025
1 parent 5b10f76 commit ee2d0e2
Show file tree
Hide file tree
Showing 17 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use core::{

use tari_utilities::{ByteArray, ByteArrayError};

use crate::tari_crypto::keys::{RistrettoPublicKey, RistrettoSecretKey};
use crate::crypto::keys::{RistrettoPublicKey, RistrettoSecretKey};

#[derive(Debug, Clone, Default)]
pub struct PedersenCommitment(pub(crate) RistrettoPublicKey);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use core::{

use tari_utilities::ByteArray;

use crate::tari_crypto::{
use crate::crypto::{
commitment::PedersenCommitment,
commitment_factory::PedersenCommitmentFactory,
keys::{RistrettoPublicKey, RistrettoSecretKey},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use curve25519_dalek::{
traits::{Identity, MultiscalarMul},
};

use crate::tari_crypto::{
use crate::crypto::{
commitment::PedersenCommitment,
keys::{RistrettoPublicKey, RistrettoSecretKey},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ macro_rules! hash_domain {
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct $name;

impl $crate::tari_crypto::hashing::DomainSeparation for $name {
impl $crate::crypto::hashing::DomainSeparation for $name {
fn version() -> u8 {
$version
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use tari_utilities::ByteArray;
use crate::{
hash_domain,
hashing::DomainSeparatedHash,
tari_crypto::{
crypto::{
hashing::{DomainSeparatedHasher, DomainSeparation},
keys::{RistrettoPublicKey, RistrettoSecretKey},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use tari_utilities::ByteArray;
use zeroize::Zeroizing;

use crate::{
tari_crypto::keys::RistrettoPublicKey,
crypto::keys::RistrettoPublicKey,
utils::{derive_from_bip32_key, get_key_from_canonical_bytes},
AppSW,
KeyType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use zeroize::Zeroizing;
use crate::{
alloc::string::ToString,
hashing::DomainSeparatedConsensusHasher,
tari_crypto::{
crypto::{
commitment::PedersenCommitment,
commitment_and_public_key_signature::CommitmentAndPublicKeySignature,
commitment_factory::PedersenCommitmentFactory,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use ledger_device_sdk::nbgl::NbglStatus;
use ledger_device_sdk::ui::gadgets::SingleMessage;
use tari_utilities::ByteArray;

use crate::{tari_crypto::keys::RistrettoPublicKey, utils::derive_from_bip32_key, AppSW, KeyType, RESPONSE_VERSION};
use crate::{crypto::keys::RistrettoPublicKey, utils::derive_from_bip32_key, AppSW, KeyType, RESPONSE_VERSION};

pub fn handler_get_public_key(comm: &mut Comm) -> Result<(), AppSW> {
let data = comm.get_data().map_err(|_| AppSW::WrongApduLength)?;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use ledger_device_sdk::ui::gadgets::SingleMessage;
use tari_utilities::ByteArray;

use crate::{
tari_crypto::keys::RistrettoPublicKey,
crypto::keys::RistrettoPublicKey,
utils::derive_from_bip32_key,
AppSW,
KeyType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use tari_utilities::ByteArray;
use crate::{
alloc::string::ToString,
hash_domain,
tari_crypto::schnorr::SchnorrSignature,
crypto::schnorr::SchnorrSignature,
utils::{derive_from_bip32_key, get_random_nonce},
AppSW,
KeyType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use ledger_device_sdk::io::Comm;
use tari_utilities::ByteArray;

use crate::{
tari_crypto::keys::RistrettoSecretKey,
crypto::keys::RistrettoSecretKey,
utils::{alpha_hasher, derive_from_bip32_key, get_key_from_canonical_bytes},
AppSW,
KeyType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use ledger_device_sdk::ui::gadgets::SingleMessage;
use crate::{
alloc::string::ToString,
hashing::DomainSeparatedConsensusHasher,
tari_crypto::{
crypto::{
commitment::PedersenCommitment,
commitment_and_public_key_signature::CommitmentAndPublicKeySignature,
commitment_factory::PedersenCommitmentFactory,
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/wallet/src/hashing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use core::marker::PhantomData;
use borsh::{io, io::Write, BorshSerialize};
use digest::Digest;

use crate::tari_crypto::hashing::DomainSeparation;
use crate::crypto::hashing::DomainSeparation;
pub struct DomainSeparatedConsensusHasher<M, D> {
hasher: DomainSeparatedBorshHasher<M, D>,
}
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/wallet/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

extern crate alloc;
mod hashing;
mod tari_crypto;
mod crypto;
pub mod utils;

mod app_ui {
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/wallet/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use zeroize::Zeroizing;
use crate::{
alloc::string::{String, ToString},
hash_domain,
tari_crypto::{hashing::DomainSeparatedHasher, keys::RistrettoSecretKey},
crypto::{hashing::DomainSeparatedHasher, keys::RistrettoSecretKey},
AppSW,
KeyType,
BIP32_COIN_TYPE,
Expand Down

0 comments on commit ee2d0e2

Please sign in to comment.