Remove Executable::mock

radix-engine-tests/tests/kernel/kernel_open_substate.rs

@@ -53,7 +53,7 @@ pub fn test_open_substate_of_invisible_package_address() {
 
     // Create kernel
     let mut system = System {
-        executable: Executable::mock(),
+        executable: (),
         blueprint_cache: NonIterMap::new(),
         auth_cache: NonIterMap::new(),
         schema_cache: NonIterMap::new(),

radix-engine-tests/tests/vm/native_vm.rs

@@ -73,7 +73,7 @@ fn panics_can_be_caught_in_the_native_vm_and_converted_into_results() {
 
     let intent_hash = Hash([0; 32]);
     let mut system = System {
-        executable: Executable::mock(),
+        executable: (),
         blueprint_cache: NonIterMap::new(),
         auth_cache: NonIterMap::new(),
         schema_cache: NonIterMap::new(),
@@ -155,7 +155,7 @@ fn any_panics_can_be_caught_in_the_native_vm_and_converted_into_results() {
 
     let intent_hash = Hash([0; 32]);
     let mut system = System {
-        executable: Executable::mock(),
+        executable: (),
         blueprint_cache: NonIterMap::new(),
         auth_cache: NonIterMap::new(),
         schema_cache: NonIterMap::new(),

radix-engine/src/object_modules/role_assignment/package.rs

@@ -334,7 +334,11 @@ impl RoleAssignmentNativePackage {
         Ok(ResolvedPermission::AccessRule(rule))
     }
 
-    fn resolve_update_role_method_permission<Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>(
+    fn resolve_update_role_method_permission<
+        Y: KernelApi<System<V, E>>,
+        V: SystemCallbackObject,
+        E,
+    >(
         receiver: &NodeId,
         module: ModuleId,
         role_key: &RoleKey,

radix-engine/src/system/payload_validation.rs

@@ -49,7 +49,13 @@ pub enum SchemaOrigin {
 // SYSTEM ADAPTERS
 //==================
 
-pub struct SystemServiceTypeInfoLookup<'s, 'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> {
+pub struct SystemServiceTypeInfoLookup<
+    's,
+    'a,
+    Y: KernelApi<System<V, E>>,
+    V: SystemCallbackObject,
+    E,
+> {
     system_service: RefCell<&'s mut SystemService<'a, Y, V, E>>,
     schema_origin: SchemaOrigin,
     allow_ownership: bool,

radix-engine/src/system/system.rs

@@ -52,7 +52,7 @@ pub const BOOT_LOADER_SYSTEM_VERSION_FIELD_KEY: FieldKey = 1u8;
 /// Provided to upper layer for invoking lower layer service
 pub struct SystemService<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> {
     pub api: &'a mut Y,
-    pub phantom: PhantomData<(V,E)>,
+    pub phantom: PhantomData<(V, E)>,
 }
 
 enum ActorStateRef {
@@ -1583,8 +1583,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemObjectApi
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemKeyValueEntryApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemKeyValueEntryApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     // Costing through kernel
     #[trace_resources]
@@ -1720,8 +1720,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemKeyValueE
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemKeyValueStoreApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemKeyValueStoreApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     // Costing through kernel
     #[trace_resources]
@@ -2004,8 +2004,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemActorInde
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemActorSortedIndexApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemActorSortedIndexApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     // Costing through kernel
     #[trace_resources]
@@ -2650,8 +2650,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemActorApi<
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemActorKeyValueEntryApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemActorKeyValueEntryApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     // Costing through kernel
     #[trace_resources]
@@ -2741,8 +2741,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemActorKeyV
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemExecutionTraceApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemExecutionTraceApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     // No costing should be applied
     #[trace_resources]
@@ -2759,8 +2759,8 @@ impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemExecution
     feature = "std",
     catch_unwind(crate::utils::catch_unwind_system_panic_transformer)
 )]
-impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E> SystemTransactionRuntimeApi<RuntimeError>
-    for SystemService<'a, Y, V, E>
+impl<'a, Y: KernelApi<System<V, E>>, V: SystemCallbackObject, E>
+    SystemTransactionRuntimeApi<RuntimeError> for SystemService<'a, Y, V, E>
 {
     #[trace_resources]
     fn get_transaction_hash(&mut self) -> Result<Hash, RuntimeError> {

radix-engine/src/system/system_callback.rs

@@ -198,7 +198,7 @@ impl<C: SystemCallbackObject, E> System<C, E> {
                             destination_blueprint_id,
                         }),
                     }))
-                        .map(|_| ())
+                    .map(|_| ())
                 } else {
                     Ok(())
                 }
@@ -772,7 +772,6 @@ impl<C: SystemCallbackObject> System<C, Executable> {
         println!("{:-^120}", "Finish");
     }
 
-
     /// Checks that references exist in the store
     fn check_references<S: BootStore + CommitableSubstateStore>(
         &mut self,

radix-engine/src/system/system_callback_api.rs

@@ -20,7 +20,7 @@ pub trait SystemCallbackObject: Sized {
             + KernelInternalApi<System<Self, E>>
             + KernelNodeApi
             + KernelSubstateApi<SystemLockData>,
-        E
+        E,
     >(
         package_address: &PackageAddress,
         package_export: PackageExport,

radix-transactions/src/model/executable.rs

@@ -172,16 +172,6 @@ impl Executable {
         }
     }
 
-    pub fn mock() -> Self {
-        Self {
-            encoded_instructions: Default::default(),
-            references: Default::default(),
-            blobs: Default::default(),
-            context: ExecutionContext::mock(),
-            system: false,
-        }
-    }
-
     // Consuming builder-like customization methods:
 
     pub fn is_system(&self) -> bool {

scrypto-test/src/ledger_simulator/inject_costing_err.rs

@@ -471,8 +471,8 @@ impl<'a, M: SystemCallbackObject + 'a, K: KernelApi<InjectCostingError<M>>> Kern
     }
 }
 
-impl<'a, M: SystemCallbackObject, K: KernelApi<InjectCostingError<M>>> KernelInternalApi<System<M, Executable>>
-    for WrappedKernelApi<'a, M, K>
+impl<'a, M: SystemCallbackObject, K: KernelApi<InjectCostingError<M>>>
+    KernelInternalApi<System<M, Executable>> for WrappedKernelApi<'a, M, K>
 {
     fn kernel_get_system_state(&mut self) -> SystemState<'_, System<M, Executable>> {
         let state = self.api.kernel_get_system_state();
@@ -500,8 +500,8 @@ impl<'a, M: SystemCallbackObject, K: KernelApi<InjectCostingError<M>>> KernelInt
     }
 }
 
-impl<'a, M: SystemCallbackObject, K: KernelApi<InjectCostingError<M>>> KernelApi<System<M, Executable>>
-    for WrappedKernelApi<'a, M, K>
+impl<'a, M: SystemCallbackObject, K: KernelApi<InjectCostingError<M>>>
+    KernelApi<System<M, Executable>> for WrappedKernelApi<'a, M, K>
 {
 }