move HostInterface to core, which is the consumer of this interface

core/src/host.rs

@@ -0,0 +1,13 @@
+use std::error::Error;
+
+use athena_interface::{Address, AthenaMessage, ExecutionResult, StorageStatus};
+
+#[mockall::automock]
+pub trait HostInterface {
+  fn get_storage(&self, addr: &Address, key: &[u8; 32]) -> [u8; 32];
+  fn set_storage(&mut self, addr: &Address, key: &[u8; 32], value: &[u8; 32]) -> StorageStatus;
+  fn get_balance(&self, addr: &Address) -> u64;
+  fn call(&mut self, msg: AthenaMessage) -> ExecutionResult;
+  fn spawn(&mut self, blob: Vec<u8>) -> Address;
+  fn deploy(&mut self, code: Vec<u8>) -> Result<Address, Box<dyn Error>>;
+}

core/src/lib.rs

@@ -14,6 +14,7 @@
 #![warn(unused_extern_crates)]
 
 pub mod disassembler;
+pub mod host;
 pub mod io;
 pub mod runtime;
 pub mod syscall;

core/src/runtime/mod.rs

@@ -29,9 +29,10 @@ use std::sync::Arc;
 
 use thiserror::Error;
 
+use crate::host::HostInterface;
 use crate::utils::AthenaCoreOpts;
 
-use athena_interface::{AthenaContext, HostInterface, StatusCode};
+use athena_interface::{AthenaContext, StatusCode};
 
 /// An implementation of a runtime for the Athena RISC-V VM.
 ///
@@ -833,10 +834,8 @@ impl<'host> Runtime<'host> {
 #[cfg(test)]
 pub mod tests {
 
-  use crate::{runtime::ExecutionError, utils::with_max_gas};
-  use athena_interface::{
-    Address, AthenaContext, ExecutionResult, MockHostInterface, StatusCode, ADDRESS_LENGTH,
-  };
+  use crate::{host::MockHostInterface, runtime::ExecutionError, utils::with_max_gas};
+  use athena_interface::{Address, AthenaContext, ExecutionResult, StatusCode, ADDRESS_LENGTH};
 
   use crate::{
     runtime::Register,

core/src/syscall/host.rs

@@ -245,9 +245,10 @@ impl Syscall for SyscallHostDeploy {
 
 #[cfg(test)]
 mod tests {
-  use athena_interface::{Address, AthenaContext, ExecutionResult, MockHostInterface};
+  use athena_interface::{Address, AthenaContext, ExecutionResult};
 
   use crate::{
+    host::MockHostInterface,
     runtime::{self, Program},
     utils::{with_max_gas, AthenaCoreOpts},
   };