Refactor Cargo.toml and update test harness syntax for consistency

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 
+
 exclude = [
   "external-crates/move/crates/bytecode-interpreter-crypto",
   "external-crates/move/crates/bytecode-verifier-libfuzzer",
@@ -68,7 +69,7 @@ members = [
     "crates/rpc/rpc-api",
     "crates/core/k2", 
     "crates/command", 
-    "consensus/pow", "framework", 
+    "consensus/pow", 
 ]
 
 [profile.bench]
@@ -97,7 +98,6 @@ strip = true
 debug = false
 
 [workspace.package]
-name = "kanari-sdk"
 edition = "2021"
 categories = ["development-tools"]
 keywords = ["blockchain", "sdk"]
@@ -121,10 +121,6 @@ secp256k1 = { version = "0.30.0", features = ["rand"] }
 chacha20poly1305 = "0.10.1"
 argon2 = "0.5.3"
 
-#0
-once_cell ="1.20.2"
-tracing = "0.1.41"
-
 # Serialization
 bincode = "1.3"
 serde = { version = "1.0.217", features = ["derive", "rc"] }
@@ -230,4 +226,4 @@ move-vm-profiler = { path = "external-crates/move/crates/move-vm-profiler" }
 move-vm-runtime = { path = "external-crates/move/crates/move-vm-runtime" }
 move-vm-test-utils = { path = "external-crates/move/crates/move-vm-test-utils" }
 move-vm-types = { path = "external-crates/move/crates/move-vm-types" }
-prover_bytecode = { path = "external-crates/move/crates/move-stackless-bytecode", package="move-stackless-bytecode" }
+prover_bytecode = { path = "external-crates/move/crates/move-stackless-bytecode", package="move-stackless-bytecode" }

crates/kari-move/src/base/new.rs

@@ -81,8 +81,8 @@ edition = "legacy" # edition = "legacy" to use legacy (pre-2024) Move
             w,
             r#"
 [dependencies]
-KanariFramework = {{ git = "https://github.com/kanari-network/kanari-sdk.git", subdir = "framework/kanari-framework", rev = "main" }}
-MoveStdlib = {{ git = "https://github.com/kanari-network/kanari-sdk.git", subdir = "framework/move-stdlib", rev = "main" }}
+KanariFramework = {{ git = "https://github.com/kanari-network/kanari-sdk.git", subdir = "frameworks/kanari-framework", rev = "main" }}
+MoveStdlib = {{ git = "https://github.com/kanari-network/kanari-sdk.git", subdir = "frameworks/move-stdlib", rev = "main" }}
 # For remote import, use the `{{ git = "...", subdir = "...", rev = "..." }}`.
 # Revision can be a branch, a tag, and a commit hash.
 # MyRemotePackage = {{ git = "https://some.remote/host.git", subdir = "remote/path", rev = "main" }}
@@ -169,4 +169,4 @@ Thumbs.db
 "#;
 
     std::fs::write(project_path.join(".gitignore"), gitignore_content)
-}
+}

crates/kari-move/tests/build_testsuite.rs

@@ -20,6 +20,4 @@ fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
 }
 
 // runs all the tests
-datatest_stable::harness! {
-    { test = run_all, root = "tests/build_tests", pattern = r"args\.txt$" },
-}
+datatest_stable::harness!(run_all, "tests/build_tests", r"args\.txt$");

crates/kari-move/tests/move_unit_tests_move_vm_and_stackless_vm.rs

@@ -21,6 +21,8 @@ fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
 }
 
 // runs all the tests
-datatest_stable::harness! {
-    { test = run_all, root = "tests/move_unit_tests", pattern = r"args(\.stackless)?\.txt$" },
-}
+datatest_stable::harness!(
+    run_all,
+    "tests/move_unit_tests",
+    r"args(\.stackless)?\.txt$"
+);

crates/kari-move/tests/sandbox_testsuite.rs

@@ -20,6 +20,4 @@ fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
 }
 
 // runs all the tests
-datatest_stable::harness! {
-    { test = run_all, root = "tests/sandbox_tests", pattern = r"args\.txt$" },
-}
+datatest_stable::harness!(run_all, "tests/sandbox_tests", r"args\.txt$");