From 31f133e0182842f8e4a359fb0efe5ad6b70c0471 Mon Sep 17 00:00:00 2001 From: moana Date: Mon, 16 Dec 2024 16:31:47 +0100 Subject: [PATCH] rusk-wallet: Rename `execution-core` to `dusk-core` --- rusk-wallet/Cargo.toml | 2 +- rusk-wallet/src/bin/command.rs | 6 +++--- rusk-wallet/src/bin/command/history.rs | 4 ++-- rusk-wallet/src/bin/interactive/command_menu.rs | 2 +- rusk-wallet/src/bin/io/prompt.rs | 2 +- rusk-wallet/src/cache.rs | 2 +- rusk-wallet/src/clients.rs | 12 ++++++------ rusk-wallet/src/error.rs | 8 ++++---- rusk-wallet/src/gql.rs | 6 +++--- rusk-wallet/src/lib.rs | 6 +++--- rusk-wallet/src/wallet.rs | 8 ++++---- rusk-wallet/src/wallet/transaction.rs | 10 +++++----- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/rusk-wallet/Cargo.toml b/rusk-wallet/Cargo.toml index 8101562651..2e1c14413a 100644 --- a/rusk-wallet/Cargo.toml +++ b/rusk-wallet/Cargo.toml @@ -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 = [ diff --git a/rusk-wallet/src/bin/command.rs b/rusk-wallet/src/bin/command.rs index 8120b72652..d980fe7e36 100644 --- a/rusk-wallet/src/bin/command.rs +++ b/rusk-wallet/src/bin/command.rs @@ -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, diff --git a/rusk-wallet/src/bin/command/history.rs b/rusk-wallet/src/bin/command/history.rs index 4f640aa88c..c3b3e04577 100644 --- a/rusk-wallet/src/bin/command/history.rs +++ b/rusk-wallet/src/bin/command/history.rs @@ -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}; diff --git a/rusk-wallet/src/bin/interactive/command_menu.rs b/rusk-wallet/src/bin/interactive/command_menu.rs index f3bf05b5d5..7c2a71f0e3 100644 --- a/rusk-wallet/src/bin/interactive/command_menu.rs +++ b/rusk-wallet/src/bin/interactive/command_menu.rs @@ -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::{ diff --git a/rusk-wallet/src/bin/io/prompt.rs b/rusk-wallet/src/bin/io/prompt.rs index 7498d2c19e..605aad9884 100644 --- a/rusk-wallet/src/bin/io/prompt.rs +++ b/rusk-wallet/src/bin/io/prompt.rs @@ -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; diff --git a/rusk-wallet/src/cache.rs b/rusk-wallet/src/cache.rs index 813241ab1a..b05ae3bc72 100644 --- a/rusk-wallet/src/cache.rs +++ b/rusk-wallet/src/cache.rs @@ -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::*; diff --git a/rusk-wallet/src/clients.rs b/rusk-wallet/src/clients.rs index 368074d86b..14fafa8d57 100644 --- a/rusk-wallet/src/clients.rs +++ b/rusk-wallet/src/clients.rs @@ -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; diff --git a/rusk-wallet/src/error.rs b/rusk-wallet/src/error.rs index a1348451fb..8d900e67f0 100644 --- a/rusk-wallet/src/error.rs +++ b/rusk-wallet/src/error.rs @@ -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 @@ -176,9 +176,9 @@ impl From for Error { } } -impl From for Error { - fn from(e: execution_core::Error) -> Self { - use execution_core::Error::*; +impl From for Error { + fn from(e: dusk_core::Error) -> Self { + use dusk_core::Error::*; match e { InsufficientBalance => Self::NotEnoughBalance, diff --git a/rusk-wallet/src/gql.rs b/rusk-wallet/src/gql.rs index 868c92f783..c361db99fc 100644 --- a/rusk-wallet/src/gql.rs +++ b/rusk-wallet/src/gql.rs @@ -8,7 +8,7 @@ //! The /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}; @@ -25,9 +25,9 @@ pub struct GraphQL { } /// The tx_for_block returns a Vec 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, diff --git a/rusk-wallet/src/lib.rs b/rusk-wallet/src/lib.rs index 1529288a98..44e6ba4911 100644 --- a/rusk-wallet/src/lib.rs +++ b/rusk-wallet/src/lib.rs @@ -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; diff --git a/rusk-wallet/src/wallet.rs b/rusk-wallet/src/wallet.rs index ee2999bcc5..52cacf519c 100644 --- a/rusk-wallet/src/wallet.rs +++ b/rusk-wallet/src/wallet.rs @@ -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, diff --git a/rusk-wallet/src/wallet/transaction.rs b/rusk-wallet/src/wallet/transaction.rs index 4a001fae74..0dcf09e17c 100644 --- a/rusk-wallet/src/wallet/transaction.rs +++ b/rusk-wallet/src/wallet/transaction.rs @@ -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::{