Skip to content

Commit

Permalink
refactored file system
Browse files Browse the repository at this point in the history 
Co-authored-by: Mihai Blacioti <[email protected]>
  • Loading branch information
@andreivasilescu24 @JustEatAnApple
andreivasilescu24 and JustEatAnApple committed Aug 29, 2024
1 parent 1bf4b45 commit 3e35a45
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 47 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = [
"tools/mxpy-snippet-generator",
"tools/payload-macro-generator",
# "tools/plotter",
"tools/interactor-system-func-calls/sys-func-calls/interact/",
"tools/interactor-system-func-calls/",

"vm",

Expand Down
2 changes: 1 addition & 1 deletion ...-calls/sys-func-calls/interact/.gitignore → ...s/interactor-system-func-calls/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
state.toml

# Trace file of interactor tooling
interactor_trace.scen.json
interactor_trace.scen.json
8 changes: 4 additions & 4 deletions ...-calls/sys-func-calls/interact/Cargo.toml → ...s/interactor-system-func-calls/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[[bin]]
name = "basic-interact-sys-calls"
path = "src/basic_interact.rs"
name = "system-sc-interact"
path = "src/system_sc_interact.rs"

[package]
name = "basic-interact-sys-calls"
name = "system-sc-interact"
version = "0.0.0"
publish = false
edition = "2021"
Expand All @@ -22,4 +22,4 @@ features = ["derive"]

[dependencies.multiversx-sc-snippets]
version = "=0.52.3"
path = "../../../../framework/snippets"
path = "../../framework/snippets"
0 ...calls/sys-func-calls/interact/config.toml → .../interactor-system-func-calls/config.toml
View file
File renamed without changes.
60 changes: 30 additions & 30 deletions ...func-calls/interact/src/basic_interact.rs → ...stem-func-calls/src/system_sc_interact.rs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
mod basic_interact_cli;
mod basic_interact_config;
mod basic_interact_state;
mod system_sc_interact_cli;
mod system_sc_interact_config;
mod system_sc_interact_state;

use basic_interact_cli::NftDummyAttributes;
use basic_interact_config::Config;
use basic_interact_state::State;
use clap::Parser;
use system_sc_interact_cli::NftDummyAttributes;
use system_sc_interact_config::Config;
use system_sc_interact_state::State;

use multiversx_sc_snippets::imports::*;

Expand All @@ -15,9 +15,9 @@ async fn main() {

let mut basic_interact = SysFuncCallsInteract::init().await;

let cli = basic_interact_cli::InteractCli::parse();
let cli = system_sc_interact_cli::InteractCli::parse();
match &cli.command {
Some(basic_interact_cli::InteractCliCommand::IssueToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::IssueToken(args)) => {
basic_interact
.issue_token(
args.cost.clone(),
Expand All @@ -28,12 +28,12 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::Mint(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::Mint(args)) => {
basic_interact
.mint_token(&args.token_id, args.nonce, args.amount.clone())
.await;
},
Some(basic_interact_cli::InteractCliCommand::SetRoles(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::SetRoles(args)) => {
basic_interact
.set_roles(
&args.token_id,
Expand All @@ -45,34 +45,34 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::Burn(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::Burn(args)) => {
basic_interact
.burn_token(&args.token_id, args.nonce, args.amount.clone())
.await;
},
Some(basic_interact_cli::InteractCliCommand::PauseToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::PauseToken(args)) => {
basic_interact.pause_token(&args.token_id).await;
},
Some(basic_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
basic_interact.unpause_token(&args.token_id).await;
},
Some(basic_interact_cli::InteractCliCommand::FreezeToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::FreezeToken(args)) => {
basic_interact
.freeze_token(
&args.token_id,
Bech32Address::from_bech32_string(args.address.clone()),
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
basic_interact
.unfreeze_token(
&args.token_id,
Bech32Address::from_bech32_string(args.address.clone()),
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
basic_interact
.freeze_nft(
&args.token_id,
Expand All @@ -81,7 +81,7 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
basic_interact
.unfreeze_nft(
&args.token_id,
Expand All @@ -90,15 +90,15 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::WipeToken(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::WipeToken(args)) => {
basic_interact
.wipe_token(
&args.token_id,
Bech32Address::from_bech32_string(args.address.clone()),
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::WipeNFT(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::WipeNFT(args)) => {
basic_interact
.wipe_nft(
&args.token_id,
Expand All @@ -107,12 +107,12 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
basic_interact
.issue_non_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
.await;
},
Some(basic_interact_cli::InteractCliCommand::CreateNFT(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::CreateNFT(args)) => {
basic_interact
.mint_nft(
&args.token_id,
Expand All @@ -123,7 +123,7 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::IssueFungible(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::IssueFungible(args)) => {
basic_interact
.issue_fungible_token(
args.cost.clone(),
Expand All @@ -134,12 +134,12 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
basic_interact
.issue_semi_fungible_collection(args.cost.clone(), &args.display_name, &args.ticker)
.await;
},
Some(basic_interact_cli::InteractCliCommand::MintSft(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::MintSft(args)) => {
basic_interact
.mint_sft(
&args.token_id,
Expand All @@ -150,7 +150,7 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
basic_interact
.register_meta_esdt(
args.cost.clone(),
Expand All @@ -160,12 +160,12 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::ChangeSftMetaEsdt(args)) => {
basic_interact
.change_sft_meta_esdt(&args.token_id, args.num_decimals)
.await;
},
Some(basic_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::UnsetRoles(args)) => {
basic_interact
.unset_roles(
Bech32Address::from_bech32_string(args.address.clone()),
Expand All @@ -178,17 +178,17 @@ async fn main() {
)
.await;
},
Some(basic_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
basic_interact
.transfer_ownership(&args.token_id, &args.new_owner)
.await;
},
Some(basic_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::TransferNftCreateRole(args)) => {
basic_interact
.transfer_nft_create_role(&args.token_id, &args.old_owner, &args.new_owner)
.await;
},
Some(basic_interact_cli::InteractCliCommand::ControlChanges(args)) => {
Some(system_sc_interact_cli::InteractCliCommand::ControlChanges(args)) => {
basic_interact.control_changes(&args.token_id).await;
},

Expand Down
0 ...-calls/interact/src/basic_interact_cli.rs → ...-func-calls/src/system_sc_interact_cli.rs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lls/interact/src/basic_interact_config.rs → ...nc-calls/src/system_sc_interact_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use serde::Deserialize;
use std::io::Read;

/// Config file
const CONFIG_FILE: &str = "config.toml";
const CONFIG_FILE: &str = "../config.toml";

/// SysFuncCalls Interact configuration
#[derive(Debug, Deserialize)]
Expand Down
0 ...alls/interact/src/basic_interact_state.rs → ...unc-calls/src/system_sc_interact_state.rs
View file
File renamed without changes.

0 comments on commit 3e35a45

Please sign in to comment.