Merge pull request #2067 from radixdlt/chore/replace-eager-with-prein…

…terpret

Replace `eager_replace!` with `preinterpret!`

CHANGELOG.md

@@ -60,6 +60,7 @@
 > Other incidental features or changes which shouldn't break existing integrations, but are worthy of mention to scrypto developers, dApp developers or other integrators.
 
 * [#2053](https://github.com/radixdlt/radixdlt-scrypto/pull/2053) - Minor updates to improve the `name` and `description` of the native node module packages.
+* [#2067](https://github.com/radixdlt/radixdlt-scrypto/pull/2067) - Removed the `eager!` macro and replaced it with the rewritten, open-source and more comprehensive `preinterpret!` macro which David is supporting in an open-source [preinterpret](https://github.com/dhedey/preinterpret) crate. Give it a try for replacing code-generation procedural macros.
 
 # v1.3.x - [Cuttlefish](https://docs.radixdlt.com/docs/cuttlefish)
 

Cargo.toml

@@ -108,6 +108,7 @@ ouroboros = { version = "0.17.2" }
 paste = { version = "1.0.13" }
 perfcnt = { version = "0.8.0" }
 plotters = { version = "0.3.4" }
+preinterpret = { version = "0.2.0" }
 proc-macro2 = { version = "1.0.38" }
 quote = { version = "1.0.18" }
 radix-wasm-instrument = { version = "1.0.0", default-features = false,  features = ["ignore_custom_section"]}

build.sh

@@ -16,7 +16,6 @@ echo "Building scrypto packages and tests using cargo build, to catch errors qui
 (set -x; cd radix-engine-tests/assets/blueprints; cargo build; cargo test --no-run)
 (set -x; cd radix-clis/tests/blueprints; cargo build; cargo test --no-run)
 (set -x; cd scrypto-test/tests/blueprints; cargo build; cargo test --no-run)
-(set -x; cd scrypto-test/assets/blueprints; cargo build; cargo test --no-run)
 (set -x; cd radix-transaction-scenarios/assets/blueprints; cargo build; cargo test --no-run)
 (set -x; cd scrypto-compiler/tests/assets/scenario_1; cargo build; cargo test --no-run)
 (set -x; cd scrypto-compiler/tests/assets/scenario_2; cargo build; cargo test --no-run)
@@ -47,11 +46,6 @@ echo "Building scrypto packages used in tests with scrypto build..."
     | awk '{print substr($1, 1, length($1)-length("Cargo.toml"))}' \
     | xargs -I '{}' bash -c "set -x; $scrypto build --path {}"
 )
-(
-    find "scrypto-test/assets/blueprints" -mindepth 2 -maxdepth 2 -type f \( -name Cargo.toml \) -print \
-    | awk '{print substr($1, 1, length($1)-length("Cargo.toml"))}' \
-    | xargs -I '{}' bash -c "set -x; $scrypto build --path {}"
-)
 (
     find "radix-transaction-scenarios/assets/blueprints" -mindepth 2 -maxdepth 2 -type f \( -name Cargo.toml \) -print \
     | awk '{print substr($1, 1, length($1)-length("Cargo.toml"))}' \

check.sh

@@ -29,7 +29,6 @@ packages="Cargo.toml$lf"
 packages+="radix-engine-tests/assets/blueprints/Cargo.toml$lf"
 packages+="radix-clis/tests/blueprints/Cargo.toml$lf"
 packages+="scrypto-test/tests/blueprints/Cargo.toml$lf"
-packages+="scrypto-test/assets/blueprints/Cargo.toml$lf"
 packages+="scrypto-compiler/tests/assets/scenario_1/Cargo.toml$lf"
 packages+="scrypto-compiler/tests/assets/scenario_2/Cargo.toml$lf"
 packages+="$(find examples -mindepth 2 -maxdepth 2 -type f \( -name Cargo.toml \))$lf"

format-check.sh

@@ -29,7 +29,6 @@ packages="Cargo.toml$lf"
 packages+="radix-engine-tests/assets/blueprints/Cargo.toml$lf"
 packages+="radix-clis/tests/blueprints/Cargo.toml$lf"
 packages+="scrypto-test/tests/blueprints/Cargo.toml$lf"
-packages+="scrypto-test/assets/blueprints/Cargo.toml$lf"
 packages+="scrypto-compiler/tests/assets/scenario_1/Cargo.toml$lf"
 packages+="scrypto-compiler/tests/assets/scenario_2/Cargo.toml$lf"
 packages+="$(find examples -mindepth 2 -maxdepth 2 -type f \( -name Cargo.toml \))$lf"

format.sh

@@ -10,7 +10,6 @@ cd "$(dirname "$0")"
 (set -x; cd radix-engine-tests/assets/blueprints; cargo fmt)
 (set -x; cd radix-clis/tests/blueprints; cargo fmt)
 (set -x; cd scrypto-test/tests/blueprints; cargo fmt)
-(set -x; cd scrypto-test/assets/blueprints; cargo fmt)
 (set -x; cd scrypto-compiler/tests/assets/scenario_1; cargo fmt)
 (set -x; cd scrypto-compiler/tests/assets/scenario_2; cargo fmt)
 

radix-engine/src/system/system_db_reader.rs

@@ -872,7 +872,7 @@ impl<'a, S: SubstateDatabase + ?Sized> SystemDatabaseReader<'a, S> {
         payload: &[u8],
         payload_schema: &'b ResolvedPayloadSchema,
         depth_limit: usize,
-    ) -> Result<(), LocatedValidationError<ScryptoCustomExtension>> {
+    ) -> Result<(), LocatedValidationError<'b, ScryptoCustomExtension>> {
         let validation_context: Box<dyn ValidationContext<Error = String>> =
             Box::new(ValidationPayloadCheckerContext {
                 reader: self,

radix-rust/Cargo.toml

@@ -11,6 +11,7 @@ repository = "https://github.com/radixdlt/radixdlt-scrypto"
 serde = { workspace = true, optional = true }
 hashbrown = { workspace = true, optional = true }
 indexmap = { workspace = true }
+preinterpret = { workspace = true }
 
 [features]
 default = ["std"]

radix-rust/src/lib.rs

@@ -49,4 +49,5 @@ pub mod prelude {
     pub use crate::slice::*;
 
     pub use crate::assert_matches;
+    pub use preinterpret::preinterpret;
 }