Merge pull request #1857 from radixdlt/system-api-interface-refactor

refactor: Prefer parameter bounds over where clause
radixdlt · Aug 7, 2024 · ed7cedf · ed7cedf
2 parents 861e2b8 + eff159b
commit ed7cedf
Show file tree

Hide file tree

Showing 101 changed files with 2,699 additions and 3,838 deletions.
diff --git a/examples/everything/Cargo.lock b/examples/everything/Cargo.lock
diff --git a/examples/hello-world/Cargo.lock b/examples/hello-world/Cargo.lock
diff --git a/radix-clis/Cargo.lock b/radix-clis/Cargo.lock
diff --git a/radix-engine-interface/src/api/actor_api.rs b/radix-engine-interface/src/api/actor_api.rs
@@ -4,7 +4,6 @@ use crate::internal_prelude::*;
 use crate::types::*;
 use bitflags::bitflags;
 use radix_engine_interface::api::{ActorStateHandle, LockFlags};
-use sbor::rust::fmt::Debug;
 use sbor::rust::string::String;
 use sbor::rust::vec::Vec;
 
@@ -17,7 +16,7 @@ bitflags! {
 }
 
 /// Api which exposes methods in the context of the actor
-pub trait SystemActorApi<E: Debug> {
+pub trait SystemActorApi<E> {
     /// Retrieve the current blueprint id
     fn actor_get_blueprint_id(&mut self) -> Result<BlueprintId, E>;
 

diff --git a/radix-engine-interface/src/api/actor_key_value_entry_api.rs b/radix-engine-interface/src/api/actor_key_value_entry_api.rs
@@ -1,10 +1,9 @@
 use radix_common::data::scrypto::{scrypto_decode, ScryptoDecode};
 use radix_engine_interface::api::key_value_entry_api::KeyValueEntryHandle;
 use radix_engine_interface::api::{ActorStateHandle, CollectionIndex, LockFlags};
-use sbor::rust::fmt::Debug;
 use sbor::rust::vec::Vec;
 
-pub trait SystemActorKeyValueEntryApi<E: Debug> {
+pub trait SystemActorKeyValueEntryApi<E> {
     /// Returns a handle for a specified key value entry in a collection. If an invalid collection
     /// index or key is passed an error is returned.
     fn actor_open_key_value_entry(

diff --git a/radix-engine-interface/src/api/mod.rs b/radix-engine-interface/src/api/mod.rs
@@ -40,10 +40,14 @@ pub const ACTOR_REF_AUTH_ZONE: ActorRefHandle = 8u32;
 pub type FieldIndex = u8;
 pub type CollectionIndex = u8;
 
+use radix_common::prelude::*;
+
+pub trait SystemApiError: fmt::Debug + ScryptoCategorize + ScryptoDecode {}
+
 /// Interface of the system, for blueprints and object modules.
 ///
 /// For WASM blueprints, only a subset of the API is exposed at the moment.
-pub trait SystemApi<E: sbor::rust::fmt::Debug>:
+pub trait SystemApi<E: SystemApiError>:
     SystemActorApi<E>
     + SystemActorKeyValueEntryApi<E>
     + SystemObjectApi<E>

diff --git a/radix-engine-monkey-tests/src/resource.rs b/radix-engine-monkey-tests/src/resource.rs
@@ -33,17 +33,16 @@ pub const CUSTOM_PACKAGE_CODE_ID: u64 = 1024;
 #[derive(Clone)]
 pub struct ResourceTestInvoke;
 impl VmInvoke for ResourceTestInvoke {
-    fn invoke<Y, V>(
+    fn invoke<
+        Y: SystemApi<RuntimeError> + KernelNodeApi + KernelSubstateApi<SystemLockData>,
+        V: VmApi,
+    >(
         &mut self,
         export_name: &str,
         input: &IndexedScryptoValue,
         api: &mut Y,
         _vm_api: &V,
-    ) -> Result<IndexedScryptoValue, RuntimeError>
-    where
-        Y: SystemApi<RuntimeError> + KernelNodeApi + KernelSubstateApi<SystemLockData>,
-        V: VmApi,
-    {
+    ) -> Result<IndexedScryptoValue, RuntimeError> {
         match export_name {
             "call_vault" => {
                 let handle = api