fix(sozo): remove skipped contracts from manifest (dojoengine#2787)

* chore: remove warning due to double license * fix: ensure skipped contracts are not in manifest * fix: add some trace log
edisontim · Dec 9, 2024 · bd04c6b · bd04c6b
1 parent 36dd785
commit bd04c6b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/crates/dojo/world/src/diff/manifest.rs b/crates/dojo/world/src/diff/manifest.rs
@@ -122,6 +122,10 @@ impl Manifest {
         let mut events = Vec::new();
 
         for resource in diff.resources.values() {
+            if diff.profile_config.is_skipped(&resource.tag()) {
+                continue;
+            }
+
             match resource.resource_type() {
                 ResourceType::Contract => {
                     contracts.push(resource_diff_to_dojo_contract(diff, resource))

diff --git a/crates/katana/feeder-gateway/Cargo.toml b/crates/katana/feeder-gateway/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 edition.workspace = true
 license.workspace = true
-license-file.workspace = true
 name = "katana-feeder-gateway"
 repository.workspace = true
 version.workspace = true

diff --git a/crates/sozo/ops/src/migrate/mod.rs b/crates/sozo/ops/src/migrate/mod.rs
@@ -250,6 +250,7 @@ where
                 // TODO: maybe we want a resource diff with a new variant. Where the migration
                 // is skipped, but we still have the local resource.
                 if self.profile_config.is_skipped(&tag) {
+                    trace!(tag = resource.tag(), "Contract init skipping resource.");
                     continue;
                 }
 
@@ -344,6 +345,7 @@ where
         // Only takes the local permissions that are not already set onchain to apply them.
         for (selector, resource) in &self.diff.resources {
             if self.profile_config.is_skipped(&resource.tag()) {
+                trace!(tag = resource.tag(), "Sync permissions skipping resource.");
                 continue;
             }
 
@@ -411,6 +413,7 @@ where
         // Collects the calls and classes to be declared to sync the resources.
         for resource in self.diff.resources.values() {
             if self.profile_config.is_skipped(&resource.tag()) {
+                trace!(tag = resource.tag(), "Sync skipping resource.");
                 continue;
             }
 

diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock
@@ -14,7 +14,7 @@ version = "2.8.4"
 
 [[package]]
 name = "types_test"
-version = "1.0.3"
+version = "1.0.5"
 dependencies = [
  "dojo",
 ]
diff --git a/examples/simple/Scarb.lock b/examples/simple/Scarb.lock
@@ -3,7 +3,7 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "1.0.2"
+version = "1.0.5"
 dependencies = [
  "dojo_plugin",
 ]

diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock
@@ -31,7 +31,7 @@ dependencies = [
 
 [[package]]
 name = "dojo_examples"
-version = "1.0.3"
+version = "1.0.5"
 dependencies = [
  "armory",
  "bestiary",

diff --git a/examples/spawn-and-move/dojo_dev.toml b/examples/spawn-and-move/dojo_dev.toml
@@ -40,4 +40,4 @@ ipfs_config.password = "12290b883db9138a8ae3363b6739d220"
 "ns-others" = ["0xff"]
 
 [writers]
-"ns" = [ "ns-mock_token", "ns-actions", "ns-others" ]
+"ns" = [ "ns-mock_token", "ns-actions", "ns-others" ]