runtime: Rename instance and borrow_instance

leoyvens · leoyvens · commit bb7d6c8e3a95 · 2020-06-10T20:43:43.000-03:00
diff --git a/runtime/wasm/src/module/mod.rs b/runtime/wasm/src/module/mod.rs
@@ -57,8 +57,8 @@ impl WasmInstanceHandle {
         value: &serde_json::Value,
         user_data: &store::Value,
     ) -> Result<BlockState, anyhow::Error> {
-        let value = self.instance().asc_new(value);
-        let user_data = self.instance().asc_new(user_data);
+        let value = self.instance_mut().asc_new(value);
+        let user_data = self.instance_mut().asc_new(user_data);
 
         // Invoke the callback
         let func = self
@@ -86,7 +86,7 @@ impl WasmInstanceHandle {
         // Decide on the destination type using the mapping
         // api version provided in the subgraph manifest
         let event = if self.instance().ctx.host_exports.api_version >= Version::new(0, 0, 2) {
-            self.instance()
+            self.instance_mut()
                 .asc_new::<AscEthereumEvent<AscEthereumTransaction_0_0_2>, _>(&EthereumEventData {
                     block: EthereumBlockData::from(block.as_ref()),
                     transaction: EthereumTransactionData::from(transaction.deref()),
@@ -98,7 +98,7 @@ impl WasmInstanceHandle {
                 })
                 .erase()
         } else {
-            self.instance()
+            self.instance_mut()
                 .asc_new::<AscEthereumEvent<AscEthereumTransaction>, _>(&EthereumEventData {
                     block: EthereumBlockData::from(block.as_ref()),
                     transaction: EthereumTransactionData::from(transaction.deref()),
@@ -135,11 +135,13 @@ impl WasmInstanceHandle {
             outputs,
         };
         let arg = if self.instance().ctx.host_exports.api_version >= Version::new(0, 0, 3) {
-            self.instance()
+            self.instance_mut()
                 .asc_new::<AscEthereumCall_0_0_3, _>(&call)
                 .erase()
         } else {
-            self.instance().asc_new::<AscEthereumCall, _>(&call).erase()
+            self.instance_mut()
+                .asc_new::<AscEthereumCall, _>(&call)
+                .erase()
         };
 
         self.invoke_handler(handler_name, arg)?;
@@ -154,23 +156,22 @@ impl WasmInstanceHandle {
         let block = EthereumBlockData::from(self.instance().ctx.block.as_ref());
 
         // Prepare an EthereumBlock for the WASM runtime
-        let arg = self.instance().asc_new(&block);
+        let arg = self.instance_mut().asc_new(&block);
 
         self.invoke_handler(handler_name, arg)?;
 
         Ok(self.take_instance().ctx.state)
     }
 
-    pub(crate) fn instance(&mut self) -> RefMut<'_, WasmInstance> {
+    pub(crate) fn instance_mut(&mut self) -> RefMut<'_, WasmInstance> {
         RefMut::map(self.instance.borrow_mut(), |i| i.as_mut().unwrap())
     }
 
     pub(crate) fn take_instance(&mut self) -> WasmInstance {
         self.instance.borrow_mut().take().unwrap()
     }
 
-    #[cfg(test)]
-    pub(crate) fn borrow_instance(&self) -> std::cell::Ref<'_, WasmInstance> {
+    pub(crate) fn instance(&self) -> std::cell::Ref<'_, WasmInstance> {
         std::cell::Ref::map(self.instance.borrow(), |i| i.as_ref().unwrap())
     }
 
diff --git a/runtime/wasm/src/module/test.rs b/runtime/wasm/src/module/test.rs
@@ -171,7 +171,7 @@ fn mock_context(
 
 impl WasmInstanceHandle {
     fn get_func(&self, name: &str) -> wasmtime::Func {
-        self.borrow_instance().instance.get_func(name).unwrap()
+        self.instance().instance.get_func(name).unwrap()
     }
 
     fn invoke_export<C, R>(&self, f: &str, arg: AscPtr<C>) -> AscPtr<R> {
@@ -210,11 +210,11 @@ impl WasmInstanceHandle {
 
 impl AscHeap for WasmInstanceHandle {
     fn raw_new(&mut self, bytes: &[u8]) -> u32 {
-        self.instance().raw_new(bytes)
+        self.instance_mut().raw_new(bytes)
     }
 
     fn get(&self, offset: u32, size: u32) -> Vec<u8> {
-        self.borrow_instance().get(offset, size)
+        self.instance().get(offset, size)
     }
 }
 
@@ -328,8 +328,8 @@ async fn ipfs_map() {
         } else {
             ipfs.add(Cursor::new(json_string)).await.unwrap().hash
         };
-        let value = module.instance().asc_new(&hash);
-        let user_data = module.instance().asc_new(USER_DATA);
+        let value = module.instance_mut().asc_new(&hash);
+        let user_data = module.instance_mut().asc_new(USER_DATA);
 
         // Invoke the callback
         let func = module
@@ -416,7 +416,7 @@ async fn ipfs_map() {
 async fn ipfs_fail() {
     let mut module = test_module("ipfsFail", mock_data_source("wasm_test/ipfs_cat.wasm"));
 
-    let hash = module.instance().asc_new("invalid hash");
+    let hash = module.instance_mut().asc_new("invalid hash");
     assert!(module
         .invoke_export::<_, AscString>("ipfsCat", hash,)
         .is_null());
@@ -662,7 +662,7 @@ async fn entity_store() {
 
     // We need to empty the cache for the next test
     let cache = std::mem::replace(
-        &mut module.instance().ctx.state.entity_cache,
+        &mut module.instance_mut().ctx.state.entity_cache,
         EntityCache::new(store.clone()),
     );
     let mut mods = cache
