refactor(pvq-program): refactor except some test issues

.github/workflows/build.yml

@@ -32,17 +32,17 @@ jobs:
       - name: Check format
         run: cargo fmt --all -- --check
 
-      - name: Make dummy poc-guest-%.polkavm files
-        run: make dummy-poc-guests
-
-      - name: Cargo clippy
-        run: SKIP_WASM_BUILD= cargo clippy -- -D warnings
+      - name: Make dummy poc-guest files
+        run: make dummy-guests
 
       - name: Check no-std
         run: make check-wasm
 
-      - name: Check std
-        run: SKIP_WASM_BUILD= cargo check
+      - name: Clippy
+        run: make clippy
+
+      - name: Run tests
+        run: make test
 
   build-guest:
     runs-on: ubuntu-latest
@@ -54,16 +54,17 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown
-          components: rustfmt, clippy
+          components: rust-src, rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: poc/guests -> poc/guests/target
+          workspaces: |
+            guest-examples -> guest-examples/target
           cache-all-crates: true
 
-      - name: Cargo clippy
-        run: cd poc/guests; cargo clippy -- -D warnings
-
       - name: Install polkatool
         run: make polkatool
+
+      - name: Build guests
+        run: make guests
+

Cargo.toml

@@ -10,7 +10,7 @@ resolver = "2"
 members = [
     "poc/runtime",
 
-    "pvq-api",
+    "pvq-program",
     "pvq-executor",
     "pvq-extension-core",
     "pvq-extension-fungibles",
@@ -22,7 +22,7 @@ members = [
     "examples/example-fungibles",
     "examples/example-helloworld",
 ]
-exclude = ["poc/guests", "vendor"]
+exclude = ["guest-examples", "vendor"]
 
 [profile.release]
 # runtime requires unwinding.
@@ -31,7 +31,7 @@ opt-level = 3
 
 [workspace.dependencies]
 # local
-pvq-api = { path = "pvq-api", default-features = false }
+pvq-program = { path = "pvq-program", default-features = false }
 pvq-executor = { path = "pvq-executor", default-features = false }
 pvq-extension-core = { path = "pvq-extension-core", default-features = false }
 pvq-extension-fungibles = { path = "pvq-extension-fungibles", default-features = false }
@@ -42,6 +42,7 @@ pvq-test-runner = { path = "pvq-test-runner", default-features = false }
 
 # polkavm
 polkavm = { path = "vendor/polkavm/crates/polkavm", default-features = false }
+polkavm-derive = { path = "vendor/polkavm/crates/polkavm-derive", default-features = false }
 
 # polkadot-sdk
 sp-api = { path = "vendor/polkadot-sdk/substrate/primitives/api", default-features = false }
@@ -68,4 +69,4 @@ syn = { version = "2", features = ["full", "visit-mut", "extra-traits"] }
 quote = "1"
 proc-macro2 = "1"
 proc-macro-crate = "3"
-Inflector = { version = "0.11.4" }
+trybuild = "1"

Makefile

@@ -1,18 +1,22 @@
 run: chainspec
 	bunx @acala-network/chopsticks@latest --config poc/runtime/chopsticks.yml --genesis output/chainspec.json
 
-poc-guests: poc-guest-sum-balance poc-guest-sum-balance-percent poc-guest-total-supply poc-guest-transparent-call
+GUEST_EXAMPLES = $(shell find guest-examples -name "Cargo.toml" -not -path "guest-examples/Cargo.toml" | xargs -n1 dirname | xargs -n1 basename)
+GUEST_TARGETS = $(patsubst %,guest-%,$(GUEST_EXAMPLES))
+DUMMY_GUEST_TARGETS = $(patsubst %,dummy-guest-%,$(GUEST_EXAMPLES))
 
-dummy-poc-guests: dummy-poc-guest-sum-balance dummy-poc-guest-sum-balance-percent dummy-poc-guest-total-supply dummy-poc-guest-transparent-call
+guests: $(GUEST_TARGETS)
 
-poc-guest-%:
-	cd poc/guests; RUSTFLAGS="-D warnings" cargo build -q --release -Z build-std=core,alloc --target "../../vendor/polkavm/crates/polkavm-linker/riscv32emac-unknown-none-polkavm.json" --bin poc-guest-$* -p poc-guest-$*
+dummy-guests: $(DUMMY_GUEST_TARGETS)
+
+guest-%:
+	cd guest-examples; cargo build -q --release --bin guest-$* -p guest-$*
 	mkdir -p output
-	polkatool link --run-only-if-newer -s poc/guests/target/riscv32emac-unknown-none-polkavm/release/poc-guest-$* -o output/poc-guest-$*.polkavm
+	polkatool link --run-only-if-newer -s guest-examples/target/riscv32emac-unknown-none-polkavm/release/guest-$* -o output/guest-$*.polkavm
 
-dummy-poc-guest-%:
+dummy-guest-%:
 	mkdir -p output
-	touch output/poc-guest-$*.polkavm
+	touch output/guest-$*.polkavm
 
 tools: polkatool chain-spec-builder
 
@@ -26,16 +30,16 @@ fmt:
 	cargo fmt --all
 
 check-wasm:
-	cargo check --no-default-features --target=wasm32-unknown-unknown -p pvq-api -p pvq-executor -p pvq-extension-core -p pvq-extension-fungibles -p pvq-extension -p pvq-primitives -p pvq-runtime-api
+	cargo check --no-default-features --target=wasm32-unknown-unknown -p pvq-program -p pvq-executor -p pvq-extension-core -p pvq-extension-fungibles -p pvq-extension -p pvq-primitives -p pvq-runtime-api
 	SKIP_WASM_BUILD= cargo check --no-default-features --target=wasm32-unknown-unknown -p poc-runtime
 
 check: check-wasm
 	SKIP_WASM_BUILD= cargo check
-	cd poc/guests; cargo check
+	cd pvq-program/examples; cargo check
 
 clippy:
 	SKIP_WASM_BUILD= cargo clippy -- -D warnings
-	cd poc/guests; RUSTFLAGS="-D warnings" cargo clippy -Z build-std=core,alloc --target "../../vendor/polkavm/crates/polkavm-linker/riscv32emac-unknown-none-polkavm.json" --all
+	cd guest-examples; cargo clippy --all
 
 test:
 	SKIP_WASM_BUILD= cargo test

guest-examples/.cargo/config.toml

@@ -0,0 +1,7 @@
+[build]
+target = "../vendor/polkavm/crates/polkavm-linker/riscv32emac-unknown-none-polkavm.json"
+
+rustflags = ["-D", "warnings"]
+
+[unstable]
+build-std = ["core", "alloc"]