Skip to content

Commit

Permalink
rusk-wallet: Rename execution-core to dusk-core
Browse files Browse the repository at this point in the history
  • Loading branch information
moCello committed Dec 19, 2024
1 parent 1b466b1 commit a2f639d
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion rusk-wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ blake2b_simd = { workspace = true }

zeroize = { workspace = true, features = ["derive"] }
wallet-core = { workspace = true }
execution-core = { workspace = true }
dusk-core = { workspace = true }

tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = [
Expand Down
6 changes: 3 additions & 3 deletions rusk-wallet/src/bin/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ use std::fmt;
use std::path::PathBuf;

use clap::Subcommand;
use execution_core::stake::StakeData;
use execution_core::transfer::data::ContractCall;
use execution_core::{BlsScalar, CONTRACT_ID_BYTES};
use dusk_core::stake::StakeData;
use dusk_core::transfer::data::ContractCall;
use dusk_core::{BlsScalar, CONTRACT_ID_BYTES};
use rusk_wallet::currency::{Dusk, Lux};
use rusk_wallet::gas::{
Gas, DEFAULT_LIMIT_CALL, DEFAULT_LIMIT_DEPLOYMENT, DEFAULT_LIMIT_TRANSFER,
Expand Down
4 changes: 2 additions & 2 deletions rusk-wallet/src/bin/command/history.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::fmt::{self, Display};

use execution_core::transfer::Transaction;
use execution_core::{dusk, from_dusk};
use dusk_core::transfer::Transaction;
use dusk_core::{dusk, from_dusk};
use rusk_wallet::{BlockTransaction, DecodedNote, GraphQL};

use crate::io::{self};
Expand Down
2 changes: 1 addition & 1 deletion rusk-wallet/src/bin/interactive/command_menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use std::fmt::Display;

use execution_core::transfer::data::MAX_MEMO_SIZE;
use dusk_core::transfer::data::MAX_MEMO_SIZE;
use inquire::{InquireError, Select};
use rusk_wallet::currency::Dusk;
use rusk_wallet::gas::{
Expand Down
2 changes: 1 addition & 1 deletion rusk-wallet/src/bin/io/prompt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crossterm::{

use anyhow::Result;
use bip39::{ErrorKind, Language, Mnemonic};
use execution_core::stake::MINIMUM_STAKE;
use dusk_core::stake::MINIMUM_STAKE;

use inquire::ui::RenderConfig;
use inquire::validator::Validation;
Expand Down
2 changes: 1 addition & 1 deletion rusk-wallet/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::collections::BTreeSet;
use std::path::Path;

use dusk_bytes::{DeserializableSlice, Serializable};
use execution_core::transfer::phoenix::NoteLeaf;
use dusk_core::transfer::phoenix::NoteLeaf;
use rocksdb::{DBWithThreadMode, MultiThreaded, Options};

use super::*;
Expand Down
12 changes: 6 additions & 6 deletions rusk-wallet/src/clients.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ use std::path::Path;
use std::sync::{Arc, Mutex};

use dusk_bytes::Serializable;
use execution_core::signatures::bls::PublicKey as BlsPublicKey;
use execution_core::stake::{StakeFundOwner, StakeKeys};
use execution_core::transfer::moonlight::AccountData;
use execution_core::transfer::phoenix::{Note, NoteLeaf, Prove};
use execution_core::transfer::Transaction;
use execution_core::Error as ExecutionCoreError;
use dusk_core::signatures::bls::PublicKey as BlsPublicKey;
use dusk_core::stake::{StakeFundOwner, StakeKeys};
use dusk_core::transfer::moonlight::AccountData;
use dusk_core::transfer::phoenix::{Note, NoteLeaf, Prove};
use dusk_core::transfer::Transaction;
use dusk_core::Error as ExecutionCoreError;
use flume::Receiver;
use rues::RuesHttpClient;
use tokio::task::JoinHandle;
Expand Down
8 changes: 4 additions & 4 deletions rusk-wallet/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub enum Error {
/// The cache database couldn't find column family required
#[error("Cache database corrupted")]
CacheDatabaseCorrupted,
/// Prover errors from execution-core
/// Prover errors from dusk-core
#[error("Prover Error: {0}")]
ProverError(String),
/// Memo provided is too large
Expand Down Expand Up @@ -176,9 +176,9 @@ impl From<block_modes::InvalidKeyIvLength> for Error {
}
}

impl From<execution_core::Error> for Error {
fn from(e: execution_core::Error) -> Self {
use execution_core::Error::*;
impl From<dusk_core::Error> for Error {
fn from(e: dusk_core::Error) -> Self {
use dusk_core::Error::*;

match e {
InsufficientBalance => Self::NotEnoughBalance,
Expand Down
6 changes: 3 additions & 3 deletions rusk-wallet/src/gql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//! The <node-url>/on/gaphql/query if queried with empty bytes returns the
//! graphql schema
use execution_core::transfer::Transaction;
use dusk_core::transfer::Transaction;
use serde::Deserialize;
use tokio::time::{sleep, Duration};

Expand All @@ -25,9 +25,9 @@ pub struct GraphQL {
}

/// The tx_for_block returns a Vec<BlockTransaction> which contains
/// the execution-core transaction, its id hash and gas spent
/// the dusk-core transaction, its id hash and gas spent
pub struct BlockTransaction {
/// The execution-core transaction struct obtained from GraphQL endpoint
/// The dusk-core transaction struct obtained from GraphQL endpoint
pub tx: Transaction,
/// The hash of the transaction or the id of the transaction in string utf8
pub id: String,
Expand Down
6 changes: 3 additions & 3 deletions rusk-wallet/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ pub use wallet::{
Address, DecodedNote, Profile, SecureWalletFile, Wallet, WalletPath,
};

use execution_core::stake::StakeData;
use execution_core::transfer::phoenix::{
use dusk_core::stake::StakeData;
use dusk_core::transfer::phoenix::{
ArchivedNoteLeaf, Note, NoteOpening, PublicKey as PhoenixPublicKey,
SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
};
use execution_core::{dusk, from_dusk, BlsScalar};
use dusk_core::{dusk, from_dusk, BlsScalar};

use currency::Dusk;

Expand Down
8 changes: 4 additions & 4 deletions rusk-wallet/src/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ use std::path::{Path, PathBuf};

use bip39::{Language, Mnemonic, Seed};
use dusk_bytes::Serializable;
use execution_core::signatures::bls::{
use dusk_core::signatures::bls::{
PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
};
use execution_core::stake::StakeData;
use execution_core::transfer::phoenix::{
use dusk_core::stake::StakeData;
use dusk_core::transfer::phoenix::{
Note, NoteLeaf, PublicKey as PhoenixPublicKey,
SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
};
use execution_core::{BlsScalar, CONTRACT_ID_BYTES};
use dusk_core::{BlsScalar, CONTRACT_ID_BYTES};
use serde::Serialize;
use wallet_core::prelude::keys::{
derive_bls_pk, derive_bls_sk, derive_phoenix_pk, derive_phoenix_sk,
Expand Down
10 changes: 5 additions & 5 deletions rusk-wallet/src/wallet/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

use std::fmt::Debug;

use execution_core::signatures::bls::PublicKey as BlsPublicKey;
use execution_core::stake::StakeFundOwner;
use execution_core::transfer::data::TransactionData;
use execution_core::transfer::phoenix::PublicKey as PhoenixPublicKey;
use execution_core::transfer::Transaction;
use dusk_core::signatures::bls::PublicKey as BlsPublicKey;
use dusk_core::stake::StakeFundOwner;
use dusk_core::transfer::data::TransactionData;
use dusk_core::transfer::phoenix::PublicKey as PhoenixPublicKey;
use dusk_core::transfer::Transaction;
use rand::rngs::StdRng;
use rand::SeedableRng;
use wallet_core::transaction::{
Expand Down

0 comments on commit a2f639d

Please sign in to comment.