♻️ Refactore package archi

packages/Scarb.lock → Scarb.lock

@@ -2,13 +2,13 @@
 version = 1
 
 [[package]]
-name = "dojo"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"
-
-[[package]]
-name = "quest"
+name = "achievement"
 version = "0.0.0"
 dependencies = [
  "dojo",
 ]
+
+[[package]]
+name = "dojo"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"

Scarb.toml

@@ -0,0 +1,17 @@
+[workspace]
+members = ["packages/achievement"]
+version = "0.0.0"
+description = "Dojo quest library"
+homepage = "https://github.com/cartridge-gg/quest/"
+cairo-version = "2.7.0"
+
+[workspace.package]
+version = "0.0.0"
+
+[workspace.dependencies]
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.14" }
+starknet = "^2.7.0"
+cairo_test = "^2.7.0"
+
+[workspace.tool.fmt]
+sort-module-level-items = true

contracts/Scarb.lock

@@ -2,21 +2,21 @@
 version = 1
 
 [[package]]
-name = "dojo"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"
-
-[[package]]
-name = "quest"
+name = "achievement"
 version = "0.0.0"
 dependencies = [
  "dojo",
 ]
 
+[[package]]
+name = "dojo"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"
+
 [[package]]
 name = "quest_world"
 version = "0.0.0"
 dependencies = [
+ "achievement",
  "dojo",
- "quest",
 ]

contracts/Scarb.toml

@@ -10,7 +10,7 @@ sierra-replace-ids = true
 dev = "sozo clean && sozo build --typescript && sozo migrate plan && sozo migrate apply"
 
 [dependencies]
-quest = { path = "../packages" }
+achievement = { path = ".." }
 dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.14" }
 
 [[target.dojo]]

contracts/src/systems/actions.cairo

@@ -70,8 +70,8 @@ mod Actions {
 
     // Component imports
 
-    use quest::components::controllable::ControllableComponent;
-    use quest::components::registrable::RegistrableComponent;
+    use achievement::components::controllable::ControllableComponent;
+    use achievement::components::registrable::RegistrableComponent;
 
     // Local imports
 

packages/achievement/Scarb.toml

@@ -0,0 +1,6 @@
+[package]
+name = "achievement"
+version.workspace = true
+
+[dependencies]
+dojo.workspace = true

packages/dojo_dev.toml → packages/achievement/dojo_dev.toml

@@ -1,8 +1,8 @@
 [world]
-name = "quest"
+name = "achievement"
 description = "Dojo Achievements Library"
 website = "https://github.com/dojoengine/dojo-starter"
-seed = "quest"
+seed = "achievement"
 
 [world.socials]
 x = "https://x.com/ohayo_dojo"
@@ -11,7 +11,7 @@ github = "https://github.com/dojoengine/dojo-starter"
 telegram = "https://t.me/dojoengine"
 
 [namespace]
-default = "quest"
+default = "achievement"
 
 [env]
 rpc_url = "http://localhost:5050/"

packages/src/components/achievable.cairo → packages/achievement/src/components/achievable.cairo

@@ -15,7 +15,7 @@ mod AchievableComponent {
 
     // Internal imports
 
-    use quest::store::{Store, StoreTrait};
+    use achievement::store::{Store, StoreTrait};
 
     // Errors
 

packages/src/components/controllable.cairo → packages/achievement/src/components/controllable.cairo

@@ -15,8 +15,8 @@ mod ControllableComponent {
 
     // Internal imports
 
-    use quest::store::{Store, StoreTrait};
-    use quest::models::game::{Game, GameTrait, GameAssert};
+    use achievement::store::{Store, StoreTrait};
+    use achievement::models::game::{Game, GameTrait, GameAssert};
 
     // Storage
 

packages/src/components/registrable.cairo → packages/achievement/src/components/registrable.cairo

@@ -6,9 +6,9 @@ mod RegistrableComponent {
 
     // Internal imports
 
-    use quest::store::{Store, StoreTrait};
-    use quest::models::game::{Game, GameTrait, GameAssert};
-    use quest::models::achievement::{Achievement, AchievementTrait, AchievementAssert};
+    use achievement::store::{Store, StoreTrait};
+    use achievement::models::game::{Game, GameTrait, GameAssert};
+    use achievement::models::achievement::{Achievement, AchievementTrait, AchievementAssert};
 
     // Storage
 

packages/src/events/completion.cairo → packages/achievement/src/events/completion.cairo

@@ -1,7 +1,7 @@
 // Internal imports
 
-use quest::events::index::AchievementCompletion;
-use quest::constants;
+use achievement::events::index::AchievementCompletion;
+use achievement::constants;
 
 // Errors
 

packages/src/events/creation.cairo → packages/achievement/src/events/creation.cairo

@@ -1,7 +1,7 @@
 // Internal imports
 
-use quest::events::index::AchievementCreation;
-use quest::constants;
+use achievement::events::index::AchievementCreation;
+use achievement::constants;
 
 // Errors
 

packages/src/models/achievement.cairo → packages/achievement/src/models/achievement.cairo

@@ -1,7 +1,7 @@
 // Intenral imports
 
-use quest::models::index::Achievement;
-use quest::constants;
+use achievement::models::index::Achievement;
+use achievement::constants;
 
 // Errors
 

packages/src/models/game.cairo → packages/achievement/src/models/game.cairo

@@ -1,7 +1,7 @@
 // Intenral imports
 
-use quest::models::index::Game;
-use quest::constants;
+use achievement::models::index::Game;
+use achievement::constants;
 
 // Errors
 

packages/src/store.cairo → packages/achievement/src/store.cairo

@@ -10,13 +10,13 @@ use dojo::world::{IWorldDispatcher, IWorldDispatcherTrait};
 
 // Models imports
 
-use quest::models::game::Game;
-use quest::models::achievement::Achievement;
+use achievement::models::game::Game;
+use achievement::models::achievement::Achievement;
 
 // Events imports
 
-use quest::events::creation::{AchievementCreation, AchievementCreationTrait};
-use quest::events::completion::{AchievementCompletion, AchievementCompletionTrait};
+use achievement::events::creation::{AchievementCreation, AchievementCreationTrait};
+use achievement::events::completion::{AchievementCompletion, AchievementCompletionTrait};
 
 // Structs
 

packages/src/tests/mocks/achiever.cairo → packages/achievement/src/tests/mocks/achiever.cairo

@@ -26,7 +26,7 @@ pub mod Achiever {
 
     // Internal imports
 
-    use quest::components::achievable::AchievableComponent;
+    use achievement::components::achievable::AchievableComponent;
 
     // Local imports
 

packages/src/tests/mocks/controller.cairo → packages/achievement/src/tests/mocks/controller.cairo

@@ -8,7 +8,7 @@ trait IController<TContractState> {
 pub mod Controller {
     // Internal imports
 
-    use quest::components::controllable::ControllableComponent;
+    use achievement::components::controllable::ControllableComponent;
 
     // Local imports
 

packages/src/tests/mocks/registrer.cairo → packages/achievement/src/tests/mocks/registrer.cairo

@@ -63,7 +63,7 @@ pub mod Registrer {
 
     // Internal imports
 
-    use quest::components::registrable::RegistrableComponent;
+    use achievement::components::registrable::RegistrableComponent;
 
     // Local imports
 

packages/src/tests/setup.cairo → packages/achievement/src/tests/setup.cairo

@@ -16,10 +16,10 @@ mod setup {
 
     // Internal imports
 
-    use quest::models::index;
-    use quest::tests::mocks::achiever::{Achiever, IAchiever, IAchieverDispatcher};
-    use quest::tests::mocks::controller::{Controller, IController, IControllerDispatcher};
-    use quest::tests::mocks::registrer::{Registrer, IRegistrer, IRegistrerDispatcher};
+    use achievement::models::index;
+    use achievement::tests::mocks::achiever::{Achiever, IAchiever, IAchieverDispatcher};
+    use achievement::tests::mocks::controller::{Controller, IController, IControllerDispatcher};
+    use achievement::tests::mocks::registrer::{Registrer, IRegistrer, IRegistrerDispatcher};
 
     // Constant
 
@@ -58,7 +58,7 @@ mod setup {
         // [Setup] World
         set_contract_address(OWNER());
         let models = array![index::game::TEST_CLASS_HASH, index::achievement::TEST_CLASS_HASH,];
-        let world = spawn_test_world(array!["quest"].span(), models.span());
+        let world = spawn_test_world(array!["achievement"].span(), models.span());
 
         // [Setup] Systems
         let achiever_address = world
@@ -72,10 +72,10 @@ mod setup {
             controller: IControllerDispatcher { contract_address: controller_address },
             registrer: IRegistrerDispatcher { contract_address: registrer_address },
         };
-        world.grant_writer(dojo::utils::bytearray_hash(@"quest"), achiever_address);
-        world.grant_writer(dojo::utils::bytearray_hash(@"quest"), controller_address);
-        world.grant_writer(dojo::utils::bytearray_hash(@"quest"), registrer_address);
-        world.grant_writer(dojo::utils::bytearray_hash(@"quest"), OWNER());
+        world.grant_writer(dojo::utils::bytearray_hash(@"achievement"), achiever_address);
+        world.grant_writer(dojo::utils::bytearray_hash(@"achievement"), controller_address);
+        world.grant_writer(dojo::utils::bytearray_hash(@"achievement"), registrer_address);
+        world.grant_writer(dojo::utils::bytearray_hash(@"achievement"), OWNER());
 
         // [Setup] Context
         let context = Context { player_id: PLAYER().into() };

packages/src/tests/test_achievable.cairo → packages/achievement/src/tests/test_achievable.cairo

@@ -10,9 +10,9 @@ use starknet::testing;
 
 // Internal imports
 
-use quest::events::index::{AchievementCreation, AchievementCompletion};
-use quest::tests::mocks::achiever::{Achiever, IAchieverDispatcher, IAchieverDispatcherTrait};
-use quest::tests::setup::setup::{spawn_game, clear_events, Systems, PLAYER};
+use achievement::events::index::{AchievementCreation, AchievementCompletion};
+use achievement::tests::mocks::achiever::{Achiever, IAchieverDispatcher, IAchieverDispatcherTrait};
+use achievement::tests::setup::setup::{spawn_game, clear_events, Systems, PLAYER};
 
 // Constants
 

packages/src/tests/test_controllable.cairo → packages/achievement/src/tests/test_controllable.cairo

@@ -10,13 +10,13 @@ use starknet::testing;
 
 // Internal imports
 
-use quest::store::{Store, StoreTrait};
-use quest::models::game::{Game, GameTrait};
-use quest::models::achievement::{Achievement, AchievementTrait};
-use quest::tests::mocks::controller::{
+use achievement::store::{Store, StoreTrait};
+use achievement::models::game::{Game, GameTrait};
+use achievement::models::achievement::{Achievement, AchievementTrait};
+use achievement::tests::mocks::controller::{
     Controller, IControllerDispatcher, IControllerDispatcherTrait
 };
-use quest::tests::setup::setup::{spawn_game, Systems, Context, OWNER, PLAYER};
+use achievement::tests::setup::setup::{spawn_game, Systems, Context, OWNER, PLAYER};
 
 // Constants
 

packages/src/tests/test_registrable.cairo → packages/achievement/src/tests/test_registrable.cairo

@@ -10,11 +10,13 @@ use starknet::testing;
 
 // Internal imports
 
-use quest::store::{Store, StoreTrait};
-use quest::models::game::{Game, GameTrait};
-use quest::models::achievement::{Achievement, AchievementTrait};
-use quest::tests::mocks::registrer::{Registrer, IRegistrerDispatcher, IRegistrerDispatcherTrait};
-use quest::tests::setup::setup::{spawn_game, Systems, Context, PLAYER};
+use achievement::store::{Store, StoreTrait};
+use achievement::models::game::{Game, GameTrait};
+use achievement::models::achievement::{Achievement, AchievementTrait};
+use achievement::tests::mocks::registrer::{
+    Registrer, IRegistrerDispatcher, IRegistrerDispatcherTrait
+};
+use achievement::tests::setup::setup::{spawn_game, Systems, Context, PLAYER};
 
 // Constants
 

target/CACHEDIR.TAG

@@ -0,0 +1,3 @@
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by sozo.
+# For information about cache directory tags see https://bford.info/cachedir/