Skip to content

Commit

Permalink
♻️ Rename from bushido to arcade
Browse files Browse the repository at this point in the history
  • Loading branch information
bal7hazar committed Nov 11, 2024
1 parent 24ddc1d commit 7bc838f
Show file tree
Hide file tree
Showing 28 changed files with 65 additions and 67 deletions.
4 changes: 2 additions & 2 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
version = 1

[[package]]
name = "bushido_registry"
name = "arcade_registry"
version = "0.0.0"
dependencies = [
"dojo",
"dojo_cairo_test",
]

[[package]]
name = "bushido_trophy"
name = "arcade_trophy"
version = "0.0.0"
dependencies = [
"dojo",
Expand Down
2 changes: 1 addition & 1 deletion Scarb.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
12 changes: 6 additions & 6 deletions contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
version = 1

[[package]]
name = "bushido_registry"
name = "arcade_registry"
version = "0.0.0"
dependencies = [
"dojo",
]

[[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",
]

[[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",
]

[[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",
]
6 changes: 3 additions & 3 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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]
2 changes: 1 addition & 1 deletion contracts/dojo_dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions contracts/dojo_slot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
4 changes: 2 additions & 2 deletions contracts/src/systems/actions.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/registry/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "bushido_registry"
name = "arcade_registry"
version.workspace = true

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions packages/registry/src/components/controllable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions packages/registry/src/components/registrable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/registry/src/models/achievement.cairo
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/registry/src/models/game.cairo
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/registry/src/store.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/registry/src/tests/mocks/controller.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub mod Controller {

// Internal imports

use bushido_registry::components::controllable::ControllableComponent;
use arcade_registry::components::controllable::ControllableComponent;

// Local imports

Expand Down
2 changes: 1 addition & 1 deletion packages/registry/src/tests/mocks/registrer.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub mod Registrer {

// Internal imports

use bushido_registry::components::registrable::RegistrableComponent;
use arcade_registry::components::registrable::RegistrableComponent;

// Local imports

Expand Down
8 changes: 3 additions & 5 deletions packages/registry/src/tests/setup.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions packages/registry/src/tests/test_controllable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions packages/registry/src/tests/test_registrable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/trophy/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "bushido_trophy"
name = "arcade_trophy"
version.workspace = true

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions packages/trophy/src/components/achievable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/trophy/src/events/index.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion packages/trophy/src/events/progress.cairo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Internal imports

use bushido_trophy::events::index::TrophyProgression;
use arcade_trophy::events::index::TrophyProgression;

// Errors

Expand Down
4 changes: 2 additions & 2 deletions packages/trophy/src/events/trophy.cairo
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions packages/trophy/src/store.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions packages/trophy/src/tests/mocks/achiever.cairo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Internal imports

use bushido_trophy::types::task::Task;
use arcade_trophy::types::task::Task;

#[starknet::interface]
trait IAchiever<TContractState> {
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/trophy/src/tests/setup.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions packages/trophy/src/tests/test_achievable.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/trophy/src/types/task.cairo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Internal imports

use bushido_trophy::types::index::Task;
use arcade_trophy::types::index::Task;

// Errors

Expand Down

0 comments on commit 7bc838f

Please sign in to comment.