eigerco · th7nder · Nov 26, 2024 · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,10 +10,10 @@ members = [
   "cli/polka-storage-provider/client",
   "cli/polka-storage-provider/common",
   "cli/polka-storage-provider/server",
-  "cli/polka-storage/storagext",
-  "cli/polka-storage/storagext-cli",
   "lib/polka-storage-proofs",
   "maat",
+  "mater/cli",
+  "mater/lib",
   "node",
   "pallets/faucet",
   "pallets/market",
@@ -23,9 +23,9 @@ members = [
   "primitives/commitment",
   "primitives/proofs",
   "runtime",
-  "storage/mater",
-  "storage/mater-cli",
   "storage/polka-index",
+  "storagext/cli",
+  "storagext/lib",
 ]
 resolver = "2"
 
@@ -130,8 +130,7 @@ zombienet-sdk = "0.2.15"
 zombienet-support = "0.2.15"
 
 # Local
-cli-primitives = { path = "primitives/cli" }
-mater = { path = "storage/mater" }
+mater = { path = "mater/lib" }
 pallet-faucet = { path = "pallets/faucet", default-features = false }
 pallet-market = { path = "pallets/market", default-features = false }
 pallet-proofs = { path = "pallets/proofs", default-features = false }
@@ -142,7 +141,7 @@ polka-storage-provider-common = { path = "cli/polka-storage-provider/common" }
 polka-storage-runtime = { path = "runtime" }
 primitives-commitment = { path = "primitives/commitment" }
 primitives-proofs = { path = "primitives/proofs", default-features = false }
-storagext = { path = "cli/polka-storage/storagext" }
+storagext = { path = "storagext/lib" }
 
 # FileCoin proofs
 bellpepper-core = "0.2"

diff --git a/Justfile b/Justfile
@@ -5,7 +5,7 @@ alias f := fmt
 
 # Generate the `metadata.scale` file, requires the node to be up and running at `127.0.0.1:42069`
 generate-scale:
-    subxt metadata -a --url http://127.0.0.1:42069 > cli/artifacts/metadata.scale
+    subxt metadata -a --url http://127.0.0.1:42069 > storagext/lib/artifacts/metadata.scale
 
 # Lint the project
 lint:

diff --git a/api/.gitkeep b/api/.gitkeep
diff --git a/cli/polka-storage/.gitkeep b/cli/polka-storage/.gitkeep
diff --git a/cli/polka-storage/storagext-cli/README.md b/cli/polka-storage/storagext-cli/README.md
diff --git a/market-protocols/.gitkeep b/market-protocols/.gitkeep
diff --git a/storage/mater-cli/Cargo.toml → mater/cli/Cargo.toml b/storage/mater-cli/Cargo.toml → mater/cli/Cargo.toml
diff --git a/storage/mater-cli/README.md → mater/cli/README.md b/storage/mater-cli/README.md → mater/cli/README.md
diff --git a/storage/mater-cli/src/convert.rs → mater/cli/src/convert.rs b/storage/mater-cli/src/convert.rs → mater/cli/src/convert.rs
diff --git a/storage/mater-cli/src/error.rs → mater/cli/src/error.rs b/storage/mater-cli/src/error.rs → mater/cli/src/error.rs
diff --git a/storage/mater-cli/src/extract.rs → mater/cli/src/extract.rs b/storage/mater-cli/src/extract.rs → mater/cli/src/extract.rs
diff --git a/storage/mater-cli/src/main.rs → mater/cli/src/main.rs b/storage/mater-cli/src/main.rs → mater/cli/src/main.rs
diff --git a/storage/mater/BENCHMARK.md → mater/lib/BENCHMARK.md b/storage/mater/BENCHMARK.md → mater/lib/BENCHMARK.md
diff --git a/storage/mater/Cargo.toml → mater/lib/Cargo.toml b/storage/mater/Cargo.toml → mater/lib/Cargo.toml
diff --git a/storage/mater/README.md → mater/lib/README.md b/storage/mater/README.md → mater/lib/README.md
diff --git a/storage/mater/benches/benchmark.rs → mater/lib/benches/benchmark.rs b/storage/mater/benches/benchmark.rs → mater/lib/benches/benchmark.rs
diff --git a/storage/mater/src/async_varint.rs → mater/lib/src/async_varint.rs b/storage/mater/src/async_varint.rs → mater/lib/src/async_varint.rs
diff --git a/storage/mater/src/lib.rs → mater/lib/src/lib.rs b/storage/mater/src/lib.rs → mater/lib/src/lib.rs
diff --git a/storage/mater/src/multicodec.rs → mater/lib/src/multicodec.rs b/storage/mater/src/multicodec.rs → mater/lib/src/multicodec.rs
diff --git a/storage/mater/src/stores/blockstore.rs → mater/lib/src/stores/blockstore.rs b/storage/mater/src/stores/blockstore.rs → mater/lib/src/stores/blockstore.rs
diff --git a/storage/mater/src/stores/filestore.rs → mater/lib/src/stores/filestore.rs b/storage/mater/src/stores/filestore.rs → mater/lib/src/stores/filestore.rs
diff --git a/storage/mater/src/stores/mod.rs → mater/lib/src/stores/mod.rs b/storage/mater/src/stores/mod.rs → mater/lib/src/stores/mod.rs
diff --git a/storage/mater/src/unixfs/mod.rs → mater/lib/src/unixfs/mod.rs b/storage/mater/src/unixfs/mod.rs → mater/lib/src/unixfs/mod.rs
diff --git a/storage/mater/src/unixfs/unixfs.proto → mater/lib/src/unixfs/unixfs.proto b/storage/mater/src/unixfs/unixfs.proto → mater/lib/src/unixfs/unixfs.proto
diff --git a/storage/mater/src/unixfs/unixfs_pb.rs → mater/lib/src/unixfs/unixfs_pb.rs b/storage/mater/src/unixfs/unixfs_pb.rs → mater/lib/src/unixfs/unixfs_pb.rs
diff --git a/storage/mater/src/v1/mod.rs → mater/lib/src/v1/mod.rs b/storage/mater/src/v1/mod.rs → mater/lib/src/v1/mod.rs
diff --git a/storage/mater/src/v1/reader.rs → mater/lib/src/v1/reader.rs b/storage/mater/src/v1/reader.rs → mater/lib/src/v1/reader.rs
diff --git a/storage/mater/src/v1/writer.rs → mater/lib/src/v1/writer.rs b/storage/mater/src/v1/writer.rs → mater/lib/src/v1/writer.rs
diff --git a/storage/mater/src/v2/index.rs → mater/lib/src/v2/index.rs b/storage/mater/src/v2/index.rs → mater/lib/src/v2/index.rs
diff --git a/storage/mater/src/v2/mod.rs → mater/lib/src/v2/mod.rs b/storage/mater/src/v2/mod.rs → mater/lib/src/v2/mod.rs
diff --git a/storage/mater/src/v2/reader.rs → mater/lib/src/v2/reader.rs b/storage/mater/src/v2/reader.rs → mater/lib/src/v2/reader.rs
diff --git a/storage/mater/src/v2/writer.rs → mater/lib/src/v2/writer.rs b/storage/mater/src/v2/writer.rs → mater/lib/src/v2/writer.rs
diff --git a/...age/mater/tests/fixtures/car_v1/lorem.car → mater/lib/tests/fixtures/car_v1/lorem.car b/...age/mater/tests/fixtures/car_v1/lorem.car → mater/lib/tests/fixtures/car_v1/lorem.car
diff --git a/...er/tests/fixtures/car_v1/lorem_header.car → ...ib/tests/fixtures/car_v1/lorem_header.car b/...er/tests/fixtures/car_v1/lorem_header.car → ...ib/tests/fixtures/car_v1/lorem_header.car
diff --git a/...ter/tests/fixtures/car_v1/spaceglenda.car → ...lib/tests/fixtures/car_v1/spaceglenda.car b/...ter/tests/fixtures/car_v1/spaceglenda.car → ...lib/tests/fixtures/car_v1/spaceglenda.car
diff --git a/...age/mater/tests/fixtures/car_v2/empty.car → mater/lib/tests/fixtures/car_v2/empty.car b/...age/mater/tests/fixtures/car_v2/empty.car → mater/lib/tests/fixtures/car_v2/empty.car
diff --git a/...age/mater/tests/fixtures/car_v2/lorem.car → mater/lib/tests/fixtures/car_v2/lorem.car b/...age/mater/tests/fixtures/car_v2/lorem.car → mater/lib/tests/fixtures/car_v2/lorem.car
diff --git a/...ter/tests/fixtures/car_v2/spaceglenda.car → ...lib/tests/fixtures/car_v2/spaceglenda.car b/...ter/tests/fixtures/car_v2/spaceglenda.car → ...lib/tests/fixtures/car_v2/spaceglenda.car
diff --git a/...e/mater/tests/fixtures/original/lorem.txt → mater/lib/tests/fixtures/original/lorem.txt b/...e/mater/tests/fixtures/original/lorem.txt → mater/lib/tests/fixtures/original/lorem.txt
diff --git a/...er/tests/fixtures/original/lorem_1024.txt → ...ib/tests/fixtures/original/lorem_1024.txt b/...er/tests/fixtures/original/lorem_1024.txt → ...ib/tests/fixtures/original/lorem_1024.txt
diff --git a/...ests/fixtures/original/lorem_4096_dup.txt → ...ests/fixtures/original/lorem_4096_dup.txt b/...ests/fixtures/original/lorem_4096_dup.txt → ...ests/fixtures/original/lorem_4096_dup.txt
diff --git a/...r/tests/fixtures/original/spaceglenda.jpg → ...b/tests/fixtures/original/spaceglenda.jpg b/...r/tests/fixtures/original/spaceglenda.jpg → ...b/tests/fixtures/original/spaceglenda.jpg
diff --git a/network/.gitkeep b/network/.gitkeep
diff --git a/pallets/collator-power/.gitkeep b/pallets/collator-power/.gitkeep
diff --git a/pallets/collator-reward/.gitkeep b/pallets/collator-reward/.gitkeep
diff --git a/pallets/collator-selection/.gitkeep b/pallets/collator-selection/.gitkeep
diff --git a/pallets/payment-channel/.gitkeep b/pallets/payment-channel/.gitkeep
diff --git a/pallets/xcm-dispatcher/.gitkeep b/pallets/xcm-dispatcher/.gitkeep
diff --git a/storage/file-storage/.gitkeep b/storage/file-storage/.gitkeep
diff --git a/cli/polka-storage/storagext-cli/Cargo.toml → storagext/cli/Cargo.toml b/cli/polka-storage/storagext-cli/Cargo.toml → storagext/cli/Cargo.toml
diff --git a/storagext/cli/README.md b/storagext/cli/README.md
@@ -0,0 +1,3 @@
+# storagext CLI
+
+Docs for the storagext CLI can be found in [the book](../../docs/src/storagext-cli/index.md)
diff --git a/...a-storage/storagext-cli/src/cmd/faucet.rs → storagext/cli/src/cmd/faucet.rs b/...a-storage/storagext-cli/src/cmd/faucet.rs → storagext/cli/src/cmd/faucet.rs
diff --git a/...a-storage/storagext-cli/src/cmd/market.rs → storagext/cli/src/cmd/market.rs b/...a-storage/storagext-cli/src/cmd/market.rs → storagext/cli/src/cmd/market.rs
diff --git a/...olka-storage/storagext-cli/src/cmd/mod.rs → storagext/cli/src/cmd/mod.rs b/...olka-storage/storagext-cli/src/cmd/mod.rs → storagext/cli/src/cmd/mod.rs
diff --git a/...a-storage/storagext-cli/src/cmd/proofs.rs → storagext/cli/src/cmd/proofs.rs b/...a-storage/storagext-cli/src/cmd/proofs.rs → storagext/cli/src/cmd/proofs.rs
diff --git a/...orage/storagext-cli/src/cmd/randomness.rs → storagext/cli/src/cmd/randomness.rs b/...orage/storagext-cli/src/cmd/randomness.rs → storagext/cli/src/cmd/randomness.rs
diff --git a/...storagext-cli/src/cmd/storage_provider.rs → storagext/cli/src/cmd/storage_provider.rs b/...storagext-cli/src/cmd/storage_provider.rs → storagext/cli/src/cmd/storage_provider.rs
diff --git a/...a-storage/storagext-cli/src/cmd/system.rs → storagext/cli/src/cmd/system.rs b/...a-storage/storagext-cli/src/cmd/system.rs → storagext/cli/src/cmd/system.rs
diff --git a/cli/polka-storage/storagext-cli/src/main.rs → storagext/cli/src/main.rs b/cli/polka-storage/storagext-cli/src/main.rs → storagext/cli/src/main.rs
diff --git a/cli/polka-storage/storagext/Cargo.toml → storagext/lib/Cargo.toml b/cli/polka-storage/storagext/Cargo.toml → storagext/lib/Cargo.toml
diff --git a/cli/polka-storage/storagext/README.md → storagext/lib/README.md b/cli/polka-storage/storagext/README.md → storagext/lib/README.md
@@ -2,7 +2,6 @@
 
 Extrinsics library for the Polka Storage Parachain.
 
-
 ## Development note:
 
 `subxt` and `frame_support` don't play nice with eachother!
diff --git a/cli/artifacts/metadata.scale → storagext/lib/artifacts/metadata.scale b/cli/artifacts/metadata.scale → storagext/lib/artifacts/metadata.scale
diff --git a/cli/polka-storage/storagext/build.rs → storagext/lib/build.rs b/cli/polka-storage/storagext/build.rs → storagext/lib/build.rs
@@ -1,5 +1,5 @@
 fn main() {
     // This ensures that the library recompiles when the SCALE file suffers changes
     // To generate a new scale file use `just generate-scale` after running the parachain.
-    println!("cargo::rerun-if-changed=../../artifacts/metadata.scale")
+    println!("cargo::rerun-if-changed=./artifacts/metadata.scale")
 }
diff --git a/...a-storage/storagext/src/clients/faucet.rs → storagext/lib/src/clients/faucet.rs b/...a-storage/storagext/src/clients/faucet.rs → storagext/lib/src/clients/faucet.rs
diff --git a/...a-storage/storagext/src/clients/market.rs → storagext/lib/src/clients/market.rs b/...a-storage/storagext/src/clients/market.rs → storagext/lib/src/clients/market.rs
diff --git a/...olka-storage/storagext/src/clients/mod.rs → storagext/lib/src/clients/mod.rs b/...olka-storage/storagext/src/clients/mod.rs → storagext/lib/src/clients/mod.rs
diff --git a/...a-storage/storagext/src/clients/proofs.rs → storagext/lib/src/clients/proofs.rs b/...a-storage/storagext/src/clients/proofs.rs → storagext/lib/src/clients/proofs.rs
diff --git a/...orage/storagext/src/clients/randomness.rs → storagext/lib/src/clients/randomness.rs b/...orage/storagext/src/clients/randomness.rs → storagext/lib/src/clients/randomness.rs
diff --git a/...storagext/src/clients/storage_provider.rs → ...agext/lib/src/clients/storage_provider.rs b/...storagext/src/clients/storage_provider.rs → ...agext/lib/src/clients/storage_provider.rs
diff --git a/...a-storage/storagext/src/clients/system.rs → storagext/lib/src/clients/system.rs b/...a-storage/storagext/src/clients/system.rs → storagext/lib/src/clients/system.rs
diff --git a/cli/polka-storage/storagext/src/deser.rs → storagext/lib/src/deser.rs b/cli/polka-storage/storagext/src/deser.rs → storagext/lib/src/deser.rs
diff --git a/cli/polka-storage/storagext/src/lib.rs → storagext/lib/src/lib.rs b/cli/polka-storage/storagext/src/lib.rs → storagext/lib/src/lib.rs
diff --git a/cli/polka-storage/storagext/src/multipair.rs → storagext/lib/src/multipair.rs b/cli/polka-storage/storagext/src/multipair.rs → storagext/lib/src/multipair.rs
diff --git a/...rage/storagext/src/runtime/bounded_vec.rs → storagext/lib/src/runtime/bounded_vec.rs b/...rage/storagext/src/runtime/bounded_vec.rs → storagext/lib/src/runtime/bounded_vec.rs
diff --git a/...a-storage/storagext/src/runtime/client.rs → storagext/lib/src/runtime/client.rs b/...a-storage/storagext/src/runtime/client.rs → storagext/lib/src/runtime/client.rs
diff --git a/...e/storagext/src/runtime/display/faucet.rs → storagext/lib/src/runtime/display/faucet.rs b/...e/storagext/src/runtime/display/faucet.rs → storagext/lib/src/runtime/display/faucet.rs
diff --git a/...e/storagext/src/runtime/display/market.rs → storagext/lib/src/runtime/display/market.rs b/...e/storagext/src/runtime/display/market.rs → storagext/lib/src/runtime/display/market.rs
diff --git a/...rage/storagext/src/runtime/display/mod.rs → storagext/lib/src/runtime/display/mod.rs b/...rage/storagext/src/runtime/display/mod.rs → storagext/lib/src/runtime/display/mod.rs
diff --git a/...e/storagext/src/runtime/display/proofs.rs → storagext/lib/src/runtime/display/proofs.rs b/...e/storagext/src/runtime/display/proofs.rs → storagext/lib/src/runtime/display/proofs.rs
diff --git a/...t/src/runtime/display/storage_provider.rs → ...b/src/runtime/display/storage_provider.rs b/...t/src/runtime/display/storage_provider.rs → ...b/src/runtime/display/storage_provider.rs
diff --git a/...olka-storage/storagext/src/runtime/mod.rs → storagext/lib/src/runtime/mod.rs b/...olka-storage/storagext/src/runtime/mod.rs → storagext/lib/src/runtime/mod.rs
@@ -10,7 +10,7 @@ pub mod display;
 // NOTE: you'll need to reload the window if the underlying SCALE file changes
 // https://github.com/rust-lang/rust-analyzer/issues/10719
 #[subxt::subxt(
-    runtime_metadata_path = "../../artifacts/metadata.scale",
+    runtime_metadata_path = "./artifacts/metadata.scale",
     derive_for_all_types = "Clone, PartialEq, Eq",
     substitute_type(
         path = "sp_runtime::MultiSignature",

diff --git a/...lka-storage/storagext/src/types/market.rs → storagext/lib/src/types/market.rs b/...lka-storage/storagext/src/types/market.rs → storagext/lib/src/types/market.rs
diff --git a/cli/polka-storage/storagext/src/types/mod.rs → storagext/lib/src/types/mod.rs b/cli/polka-storage/storagext/src/types/mod.rs → storagext/lib/src/types/mod.rs
diff --git a/...lka-storage/storagext/src/types/proofs.rs → storagext/lib/src/types/proofs.rs b/...lka-storage/storagext/src/types/proofs.rs → storagext/lib/src/types/proofs.rs
diff --git a/...e/storagext/src/types/storage_provider.rs → storagext/lib/src/types/storage_provider.rs b/...e/storagext/src/types/storage_provider.rs → storagext/lib/src/types/storage_provider.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# storagext CLI

		Docs for the storagext CLI can be found in [the book](../../docs/src/storagext-cli/index.md)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@

		Extrinsics library for the Polka Storage Parachain.


		## Development note:

		`subxt` and `frame_support` don't play nice with eachother!