From 7bc838f173278e1b0b60044e32cc7c489230de92 Mon Sep 17 00:00:00 2001 From: bal7hazar Date: Mon, 11 Nov 2024 11:03:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20from=20bushido=20?= =?UTF-8?q?to=20arcade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scarb.lock | 4 ++-- Scarb.toml | 2 +- contracts/Scarb.lock | 12 ++++++------ contracts/Scarb.toml | 6 +++--- contracts/dojo_dev.toml | 2 +- contracts/dojo_slot.toml | 4 ++-- contracts/src/systems/actions.cairo | 4 ++-- packages/registry/Scarb.toml | 2 +- packages/registry/src/components/controllable.cairo | 4 ++-- packages/registry/src/components/registrable.cairo | 6 +++--- packages/registry/src/models/achievement.cairo | 4 ++-- packages/registry/src/models/game.cairo | 4 ++-- packages/registry/src/store.cairo | 4 ++-- packages/registry/src/tests/mocks/controller.cairo | 2 +- packages/registry/src/tests/mocks/registrer.cairo | 2 +- packages/registry/src/tests/setup.cairo | 8 +++----- packages/registry/src/tests/test_controllable.cairo | 10 +++++----- packages/registry/src/tests/test_registrable.cairo | 10 +++++----- packages/trophy/Scarb.toml | 2 +- packages/trophy/src/components/achievable.cairo | 4 ++-- packages/trophy/src/events/index.cairo | 2 +- packages/trophy/src/events/progress.cairo | 2 +- packages/trophy/src/events/trophy.cairo | 4 ++-- packages/trophy/src/store.cairo | 6 +++--- packages/trophy/src/tests/mocks/achiever.cairo | 6 +++--- packages/trophy/src/tests/setup.cairo | 4 ++-- packages/trophy/src/tests/test_achievable.cairo | 10 +++++----- packages/trophy/src/types/task.cairo | 2 +- 28 files changed, 65 insertions(+), 67 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index 713371f..e074b54 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -2,7 +2,7 @@ version = 1 [[package]] -name = "bushido_registry" +name = "arcade_registry" version = "0.0.0" dependencies = [ "dojo", @@ -10,7 +10,7 @@ dependencies = [ ] [[package]] -name = "bushido_trophy" +name = "arcade_trophy" version = "0.0.0" dependencies = [ "dojo", diff --git a/Scarb.toml b/Scarb.toml index 602d517..5c79e6f 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,7 +1,7 @@ [workspace] members = ["packages/trophy", "packages/registry"] description = "Dojo achievement library" -homepage = "https://github.com/cartridge-gg/bushido/" +homepage = "https://github.com/cartridge-gg/arcade/" cairo-version = "2.8.4" [workspace.package] diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock index 31a9014..6288b45 100644 --- a/contracts/Scarb.lock +++ b/contracts/Scarb.lock @@ -2,7 +2,7 @@ version = 1 [[package]] -name = "bushido_registry" +name = "arcade_registry" version = "0.0.0" dependencies = [ "dojo", @@ -10,8 +10,8 @@ dependencies = [ [[package]] name = "dojo" -version = "1.0.0-rc.0" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" +version = "1.0.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3" dependencies = [ "dojo_plugin", ] @@ -19,7 +19,7 @@ dependencies = [ [[package]] name = "dojo_cairo_test" version = "1.0.0-rc.0" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3" dependencies = [ "dojo", ] @@ -27,13 +27,13 @@ dependencies = [ [[package]] name = "dojo_plugin" version = "2.8.4" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3" [[package]] name = "game_center" version = "0.0.0" dependencies = [ - "bushido_registry", + "arcade_registry", "dojo", "dojo_cairo_test", ] diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml index 983e925..b86f719 100644 --- a/contracts/Scarb.toml +++ b/contracts/Scarb.toml @@ -11,7 +11,7 @@ dev = "sozo clean && sozo build --typescript && sozo migrate plan && sozo migrat [dependencies] dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" } -bushido_registry = { path = ".." } +arcade_registry = { path = ".." } starknet = "2.8.4" cairo_test = "2.8.4" @@ -21,8 +21,8 @@ dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" } [[target.starknet-contract]] build-external-contracts = [ "dojo::world::world_contract::world", - "bushido_registry::models::index::m_Game", - "bushido_registry::models::index::m_Achievement", + "arcade_registry::models::index::m_Game", + "arcade_registry::models::index::m_Achievement", ] [profile.slot] diff --git a/contracts/dojo_dev.toml b/contracts/dojo_dev.toml index 6aa0303..d15138a 100644 --- a/contracts/dojo_dev.toml +++ b/contracts/dojo_dev.toml @@ -2,7 +2,7 @@ name = "Cartridge World" description = "Cartridge World Achievements" website = "https://github.com/dojoengine/dojo-starter" -seed = "bushido" +seed = "arcade" [world.socials] x = "https://x.com/ohayo_dojo" diff --git a/contracts/dojo_slot.toml b/contracts/dojo_slot.toml index cae9ea8..01a15a4 100644 --- a/contracts/dojo_slot.toml +++ b/contracts/dojo_slot.toml @@ -2,7 +2,7 @@ name = "Cartridge World" description = "Cartridge World Achievements" website = "https://github.com/dojoengine/dojo-starter" -seed = "bushido" +seed = "arcade" [world.socials] x = "https://x.com/ohayo_dojo" @@ -17,6 +17,6 @@ default = "game_center" "game_center" = ["game_center-Actions"] [env] -rpc_url = "https://api.cartridge.gg/x/bushido/katana" +rpc_url = "https://api.cartridge.gg/x/arcade/katana" account_address = "0x79e1341bc8e27b2ae2544fe902f0c9e723cfba8e37c47371d90385cc17265cc" private_key = "0x506a3b48830c89357283236d8724f68d014d681499b2256e7589c950a4198c5" diff --git a/contracts/src/systems/actions.cairo b/contracts/src/systems/actions.cairo index 6d03e10..87203b8 100644 --- a/contracts/src/systems/actions.cairo +++ b/contracts/src/systems/actions.cairo @@ -74,8 +74,8 @@ mod Actions { // Component imports - use bushido_registry::components::controllable::ControllableComponent; - use bushido_registry::components::registrable::RegistrableComponent; + use arcade_registry::components::controllable::ControllableComponent; + use arcade_registry::components::registrable::RegistrableComponent; // Local imports diff --git a/packages/registry/Scarb.toml b/packages/registry/Scarb.toml index 0db7693..5817c43 100644 --- a/packages/registry/Scarb.toml +++ b/packages/registry/Scarb.toml @@ -1,5 +1,5 @@ [package] -name = "bushido_registry" +name = "arcade_registry" version.workspace = true [dependencies] diff --git a/packages/registry/src/components/controllable.cairo b/packages/registry/src/components/controllable.cairo index 03edc8e..5f5b639 100644 --- a/packages/registry/src/components/controllable.cairo +++ b/packages/registry/src/components/controllable.cairo @@ -10,8 +10,8 @@ mod ControllableComponent { // Internal imports - use bushido_registry::store::{Store, StoreTrait}; - use bushido_registry::models::game::Game; + use arcade_registry::store::{Store, StoreTrait}; + use arcade_registry::models::game::Game; // Storage diff --git a/packages/registry/src/components/registrable.cairo b/packages/registry/src/components/registrable.cairo index 00a162e..c8fe29e 100644 --- a/packages/registry/src/components/registrable.cairo +++ b/packages/registry/src/components/registrable.cairo @@ -6,9 +6,9 @@ mod RegistrableComponent { // Internal imports - use bushido_registry::store::{Store, StoreTrait}; - use bushido_registry::models::game::{Game, GameTrait, GameAssert}; - use bushido_registry::models::achievement::{Achievement, AchievementTrait, AchievementAssert}; + use arcade_registry::store::{Store, StoreTrait}; + use arcade_registry::models::game::{Game, GameTrait, GameAssert}; + use arcade_registry::models::achievement::{Achievement, AchievementTrait, AchievementAssert}; // Storage diff --git a/packages/registry/src/models/achievement.cairo b/packages/registry/src/models/achievement.cairo index e646b00..c413689 100644 --- a/packages/registry/src/models/achievement.cairo +++ b/packages/registry/src/models/achievement.cairo @@ -1,7 +1,7 @@ // Intenral imports -use bushido_registry::models::index::Achievement; -use bushido_registry::constants; +use arcade_registry::models::index::Achievement; +use arcade_registry::constants; // Errors diff --git a/packages/registry/src/models/game.cairo b/packages/registry/src/models/game.cairo index 74b2638..fd00ac1 100644 --- a/packages/registry/src/models/game.cairo +++ b/packages/registry/src/models/game.cairo @@ -1,7 +1,7 @@ // Intenral imports -use bushido_registry::models::index::Game; -use bushido_registry::constants; +use arcade_registry::models::index::Game; +use arcade_registry::constants; // Errors diff --git a/packages/registry/src/store.cairo b/packages/registry/src/store.cairo index 8360bc5..1edf3d2 100644 --- a/packages/registry/src/store.cairo +++ b/packages/registry/src/store.cairo @@ -10,8 +10,8 @@ use dojo::world::WorldStorage; use dojo::model::ModelStorage; // Models imports -use bushido_registry::models::game::Game; -use bushido_registry::models::achievement::Achievement; +use arcade_registry::models::game::Game; +use arcade_registry::models::achievement::Achievement; // Structs diff --git a/packages/registry/src/tests/mocks/controller.cairo b/packages/registry/src/tests/mocks/controller.cairo index e06a452..8777186 100644 --- a/packages/registry/src/tests/mocks/controller.cairo +++ b/packages/registry/src/tests/mocks/controller.cairo @@ -12,7 +12,7 @@ pub mod Controller { // Internal imports - use bushido_registry::components::controllable::ControllableComponent; + use arcade_registry::components::controllable::ControllableComponent; // Local imports diff --git a/packages/registry/src/tests/mocks/registrer.cairo b/packages/registry/src/tests/mocks/registrer.cairo index 115cc36..9ffc7c5 100644 --- a/packages/registry/src/tests/mocks/registrer.cairo +++ b/packages/registry/src/tests/mocks/registrer.cairo @@ -64,7 +64,7 @@ pub mod Registrer { // Internal imports - use bushido_registry::components::registrable::RegistrableComponent; + use arcade_registry::components::registrable::RegistrableComponent; // Local imports diff --git a/packages/registry/src/tests/setup.cairo b/packages/registry/src/tests/setup.cairo index aef569f..869be43 100644 --- a/packages/registry/src/tests/setup.cairo +++ b/packages/registry/src/tests/setup.cairo @@ -19,11 +19,9 @@ mod setup { // Internal imports - use bushido_registry::models::{index as models}; - use bushido_registry::tests::mocks::controller::{ - Controller, IController, IControllerDispatcher - }; - use bushido_registry::tests::mocks::registrer::{Registrer, IRegistrer, IRegistrerDispatcher}; + use arcade_registry::models::{index as models}; + use arcade_registry::tests::mocks::controller::{Controller, IController, IControllerDispatcher}; + use arcade_registry::tests::mocks::registrer::{Registrer, IRegistrer, IRegistrerDispatcher}; // Constant diff --git a/packages/registry/src/tests/test_controllable.cairo b/packages/registry/src/tests/test_controllable.cairo index aee29a5..bd33966 100644 --- a/packages/registry/src/tests/test_controllable.cairo +++ b/packages/registry/src/tests/test_controllable.cairo @@ -10,13 +10,13 @@ use starknet::testing; // Internal imports -use bushido_registry::store::{Store, StoreTrait}; -use bushido_registry::models::game::{Game, GameTrait}; -use bushido_registry::models::achievement::{Achievement, AchievementTrait}; -use bushido_registry::tests::mocks::controller::{ +use arcade_registry::store::{Store, StoreTrait}; +use arcade_registry::models::game::{Game, GameTrait}; +use arcade_registry::models::achievement::{Achievement, AchievementTrait}; +use arcade_registry::tests::mocks::controller::{ Controller, IControllerDispatcher, IControllerDispatcherTrait }; -use bushido_registry::tests::setup::setup::{spawn_game, Systems, Context, OWNER, PLAYER}; +use arcade_registry::tests::setup::setup::{spawn_game, Systems, Context, OWNER, PLAYER}; // Constants diff --git a/packages/registry/src/tests/test_registrable.cairo b/packages/registry/src/tests/test_registrable.cairo index 95c61b2..a1481a3 100644 --- a/packages/registry/src/tests/test_registrable.cairo +++ b/packages/registry/src/tests/test_registrable.cairo @@ -10,13 +10,13 @@ use starknet::testing; // Internal imports -use bushido_registry::store::{Store, StoreTrait}; -use bushido_registry::models::game::{Game, GameTrait}; -use bushido_registry::models::achievement::{Achievement, AchievementTrait}; -use bushido_registry::tests::mocks::registrer::{ +use arcade_registry::store::{Store, StoreTrait}; +use arcade_registry::models::game::{Game, GameTrait}; +use arcade_registry::models::achievement::{Achievement, AchievementTrait}; +use arcade_registry::tests::mocks::registrer::{ Registrer, IRegistrerDispatcher, IRegistrerDispatcherTrait }; -use bushido_registry::tests::setup::setup::{spawn_game, Systems, Context, PLAYER}; +use arcade_registry::tests::setup::setup::{spawn_game, Systems, Context, PLAYER}; // Constants diff --git a/packages/trophy/Scarb.toml b/packages/trophy/Scarb.toml index d130263..378ec2f 100644 --- a/packages/trophy/Scarb.toml +++ b/packages/trophy/Scarb.toml @@ -1,5 +1,5 @@ [package] -name = "bushido_trophy" +name = "arcade_trophy" version.workspace = true [dependencies] diff --git a/packages/trophy/src/components/achievable.cairo b/packages/trophy/src/components/achievable.cairo index 0700828..3d30908 100644 --- a/packages/trophy/src/components/achievable.cairo +++ b/packages/trophy/src/components/achievable.cairo @@ -14,8 +14,8 @@ mod AchievableComponent { // Internal imports - use bushido_trophy::types::task::Task; - use bushido_trophy::store::{Store, StoreTrait}; + use arcade_trophy::types::task::Task; + use arcade_trophy::store::{Store, StoreTrait}; // Errors diff --git a/packages/trophy/src/events/index.cairo b/packages/trophy/src/events/index.cairo index 9908a4a..17d6825 100644 --- a/packages/trophy/src/events/index.cairo +++ b/packages/trophy/src/events/index.cairo @@ -2,7 +2,7 @@ // Internal imports -use bushido_trophy::types::task::Task; +use arcade_trophy::types::task::Task; #[derive(Clone, Drop, Serde)] #[dojo::event(historical: true)] diff --git a/packages/trophy/src/events/progress.cairo b/packages/trophy/src/events/progress.cairo index f502ccf..114ebc9 100644 --- a/packages/trophy/src/events/progress.cairo +++ b/packages/trophy/src/events/progress.cairo @@ -1,6 +1,6 @@ // Internal imports -use bushido_trophy::events::index::TrophyProgression; +use arcade_trophy::events::index::TrophyProgression; // Errors diff --git a/packages/trophy/src/events/trophy.cairo b/packages/trophy/src/events/trophy.cairo index e9cfd47..b231b7a 100644 --- a/packages/trophy/src/events/trophy.cairo +++ b/packages/trophy/src/events/trophy.cairo @@ -1,7 +1,7 @@ // Internal imports -use bushido_trophy::events::index::TrophyCreation; -use bushido_trophy::types::task::{Task, TaskTrait}; +use arcade_trophy::events::index::TrophyCreation; +use arcade_trophy::types::task::{Task, TaskTrait}; // Errors diff --git a/packages/trophy/src/store.cairo b/packages/trophy/src/store.cairo index f9cd6cf..8e44e3d 100644 --- a/packages/trophy/src/store.cairo +++ b/packages/trophy/src/store.cairo @@ -11,12 +11,12 @@ use dojo::event::EventStorage; // Events imports -use bushido_trophy::events::trophy::{TrophyCreation, TrophyTrait}; -use bushido_trophy::events::progress::{TrophyProgression, ProgressTrait}; +use arcade_trophy::events::trophy::{TrophyCreation, TrophyTrait}; +use arcade_trophy::events::progress::{TrophyProgression, ProgressTrait}; // Internal imports -use bushido_trophy::types::task::{Task, TaskTrait}; +use arcade_trophy::types::task::{Task, TaskTrait}; // Structs diff --git a/packages/trophy/src/tests/mocks/achiever.cairo b/packages/trophy/src/tests/mocks/achiever.cairo index ecd6bd8..442a27a 100644 --- a/packages/trophy/src/tests/mocks/achiever.cairo +++ b/packages/trophy/src/tests/mocks/achiever.cairo @@ -1,6 +1,6 @@ // Internal imports -use bushido_trophy::types::task::Task; +use arcade_trophy::types::task::Task; #[starknet::interface] trait IAchiever { @@ -35,8 +35,8 @@ pub mod Achiever { // Internal imports - use bushido_trophy::types::task::Task; - use bushido_trophy::components::achievable::AchievableComponent; + use arcade_trophy::types::task::Task; + use arcade_trophy::components::achievable::AchievableComponent; // Local imports diff --git a/packages/trophy/src/tests/setup.cairo b/packages/trophy/src/tests/setup.cairo index bbbd4f4..ac95c98 100644 --- a/packages/trophy/src/tests/setup.cairo +++ b/packages/trophy/src/tests/setup.cairo @@ -19,8 +19,8 @@ mod setup { // Internal imports - use bushido_trophy::events::{index as events}; - use bushido_trophy::tests::mocks::achiever::{Achiever, IAchiever, IAchieverDispatcher}; + use arcade_trophy::events::{index as events}; + use arcade_trophy::tests::mocks::achiever::{Achiever, IAchiever, IAchieverDispatcher}; // Constant diff --git a/packages/trophy/src/tests/test_achievable.cairo b/packages/trophy/src/tests/test_achievable.cairo index 19af1d1..6c24921 100644 --- a/packages/trophy/src/tests/test_achievable.cairo +++ b/packages/trophy/src/tests/test_achievable.cairo @@ -14,13 +14,13 @@ use dojo::world::world::Event; // Internal imports -use bushido_trophy::types::task::{Task, TaskTrait}; -use bushido_trophy::events::trophy::{TrophyCreation, TrophyTrait}; -use bushido_trophy::events::progress::{TrophyProgression, ProgressTrait}; -use bushido_trophy::tests::mocks::achiever::{ +use arcade_trophy::types::task::{Task, TaskTrait}; +use arcade_trophy::events::trophy::{TrophyCreation, TrophyTrait}; +use arcade_trophy::events::progress::{TrophyProgression, ProgressTrait}; +use arcade_trophy::tests::mocks::achiever::{ Achiever, IAchieverDispatcher, IAchieverDispatcherTrait }; -use bushido_trophy::tests::setup::setup::{spawn_game, clear_events, Systems, PLAYER}; +use arcade_trophy::tests::setup::setup::{spawn_game, clear_events, Systems, PLAYER}; // Constants diff --git a/packages/trophy/src/types/task.cairo b/packages/trophy/src/types/task.cairo index 7f7827c..c13d283 100644 --- a/packages/trophy/src/types/task.cairo +++ b/packages/trophy/src/types/task.cairo @@ -1,6 +1,6 @@ // Internal imports -use bushido_trophy::types::index::Task; +use arcade_trophy::types::index::Task; // Errors