rename evm actor's Address to EthAddress (filecoin-project#665)

rename evm actor's  type to

Author: mriise

actors/evm/src/interpreter/address.rs

@@ -6,9 +6,9 @@ use fvm_shared::address::Address as FilecoinAddress;
 ///
 /// TODO this type will eventually handle f4 address detection.
 #[derive(PartialEq, Eq, Clone)]
-pub struct Address([u8; 20]);
+pub struct EthAddress([u8; 20]);
 
-impl TryFrom<U256> for Address {
+impl TryFrom<U256> for EthAddress {
     type Error = StatusCode;
 
     fn try_from(v: U256) -> Result<Self, Self::Error> {
@@ -24,24 +24,24 @@ impl TryFrom<U256> for Address {
     }
 }
 
-impl std::fmt::Debug for Address {
+impl std::fmt::Debug for EthAddress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(&hex::encode(self.0))
     }
 }
 
-impl Address {
+impl EthAddress {
     /// Expect a Filecoin address type containing an ID address, and return an address in EVM-form.
-    pub fn from_id_address(addr: &FilecoinAddress) -> Option<Address> {
-        addr.id().ok().map(Address::from_id)
+    pub fn from_id_address(addr: &FilecoinAddress) -> Option<EthAddress> {
+        addr.id().ok().map(EthAddress::from_id)
     }
 
     /// Returns an EVM-form ID address from actor ID.
-    pub fn from_id(id: u64) -> Address {
+    pub fn from_id(id: u64) -> EthAddress {
         let mut bytes = [0u8; 20];
         bytes[0] = 0xff;
         bytes[12..].copy_from_slice(&id.to_be_bytes());
-        Address(bytes)
+        EthAddress(bytes)
     }
 
     /// Interpret the hash as an ID address in EVM-form, and return a Filecoin ID address if that's
@@ -67,7 +67,7 @@ impl Address {
 
 #[cfg(test)]
 mod tests {
-    use crate::interpreter::address::Address;
+    use crate::interpreter::address::EthAddress;
     use crate::U256;
     use fvm_shared::address::Address as FilecoinAddress;
 
@@ -82,15 +82,15 @@ mod tests {
             #[test]
             fn $name() {
                 let evm_bytes = $input.concat();
-                let evm_addr = Address::try_from(U256::from(evm_bytes.as_slice())).unwrap();
+                let evm_addr = EthAddress::try_from(U256::from(evm_bytes.as_slice())).unwrap();
                 assert_eq!(
                     evm_addr.as_id_address(),
                     $expectation
                 );
 
                 // test inverse conversion, if a valid ID address was supplied
                 if let Some(fil_addr) = $expectation {
-                    assert_eq!(Address::from_id_address(&fil_addr), Some(evm_addr));
+                    assert_eq!(EthAddress::from_id_address(&fil_addr), Some(evm_addr));
                 }
             }
         )*

actors/evm/src/interpreter/instructions/call.rs

@@ -1,6 +1,6 @@
 use {
     super::memory::{copy_to_memory, get_memory_region},
-    crate::interpreter::address::Address,
+    crate::interpreter::address::EthAddress,
     crate::interpreter::instructions::memory::MemoryRegion,
     crate::interpreter::output::StatusCode,
     crate::interpreter::precompiles,
@@ -153,7 +153,7 @@ pub fn call<'r, BS: Blockstore, RT: Runtime<BS>>(
                 .map_err(|_| StatusCode::PrecompileFailure)?;
             Ok(RawBytes::from(result))
         } else {
-            let dst_addr = Address::try_from(dst)?
+            let dst_addr = EthAddress::try_from(dst)?
                 .as_id_address()
                 .ok_or_else(|| StatusCode::BadAddress("not an actor id address".to_string()))?;
 
@@ -222,7 +222,7 @@ pub fn callactor<'r, BS: Blockstore, RT: Runtime<BS>>(
         .map_err(|_| StatusCode::InvalidMemoryAccess)?;
 
     let result = {
-        let dst_addr = Address::try_from(dst)?
+        let dst_addr = EthAddress::try_from(dst)?
             .as_id_address()
             .ok_or_else(|| StatusCode::BadAddress(format!("not an actor id address: {}", dst)))?;
 

actors/evm/src/interpreter/instructions/context.rs

@@ -1,4 +1,4 @@
-use crate::interpreter::address::Address;
+use crate::interpreter::address::EthAddress;
 use {
     crate::interpreter::{ExecutionState, StatusCode, System, U256},
     fil_actors_runtime::runtime::Runtime,
@@ -19,7 +19,7 @@ pub fn caller<'r, BS: Blockstore, RT: Runtime<BS>>(
     platform: &'r System<'r, BS, RT>,
 ) {
     let id = platform.rt.message().caller().id().unwrap();
-    state.stack.push(Address::from_id(id).as_evm_word())
+    state.stack.push(EthAddress::from_id(id).as_evm_word())
 }
 
 #[inline]
@@ -28,7 +28,7 @@ pub fn address<'r, BS: Blockstore, RT: Runtime<BS>>(
     platform: &'r System<'r, BS, RT>,
 ) {
     let id = platform.rt.message().receiver().id().unwrap();
-    state.stack.push(Address::from_id(id).as_evm_word())
+    state.stack.push(EthAddress::from_id(id).as_evm_word())
 }
 
 #[inline]
@@ -37,7 +37,7 @@ pub fn origin<'r, BS: Blockstore, RT: Runtime<BS>>(
     platform: &'r System<'r, BS, RT>,
 ) {
     let id = platform.rt.message().origin().id().unwrap();
-    state.stack.push(Address::from_id(id).as_evm_word())
+    state.stack.push(EthAddress::from_id(id).as_evm_word())
 }
 
 #[inline]

actors/evm/src/interpreter/instructions/ext.rs

@@ -1,4 +1,4 @@
-use crate::interpreter::address::Address;
+use crate::interpreter::address::EthAddress;
 use crate::interpreter::instructions::memory::copy_to_memory;
 use crate::U256;
 use cid::Cid;
@@ -61,7 +61,7 @@ fn get_evm_bytecode_cid<BS: Blockstore, RT: Runtime<BS>>(
     rt: &RT,
     addr: U256,
 ) -> Result<Cid, StatusCode> {
-    let addr = Address::try_from(addr)?
+    let addr = EthAddress::try_from(addr)?
         .as_id_address()
         .ok_or_else(|| StatusCode::BadAddress("no support for non-ID addresses yet".to_string()))?;
 

actors/evm/src/interpreter/instructions/lifecycle.rs

@@ -1,4 +1,4 @@
-use crate::interpreter::address::Address;
+use crate::interpreter::address::EthAddress;
 use {
     crate::interpreter::{ExecutionState, StatusCode, System},
     fil_actors_runtime::runtime::Runtime,
@@ -19,7 +19,7 @@ pub fn selfdestruct<'r, BS: Blockstore, RT: Runtime<BS>>(
     state: &mut ExecutionState,
     _system: &'r mut System<'r, BS, RT>,
 ) -> Result<(), StatusCode> {
-    let beneficiary_addr = Address::try_from(state.stack.pop())?;
+    let beneficiary_addr = EthAddress::try_from(state.stack.pop())?;
     let id_addr = beneficiary_addr.as_id_address().expect("no support for non-ID addresses yet");
     state.selfdestroyed = Some(id_addr);
     Ok(())

actors/evm/tests/call.rs

@@ -1,6 +1,6 @@
 mod asm;
 
-use evm::interpreter::address::Address as EVMAddress;
+use evm::interpreter::address::EthAddress;
 use evm::interpreter::U256;
 use fil_actor_evm as evm;
 use fil_actors_runtime::test_utils::*;
@@ -77,7 +77,7 @@ fn test_call() {
     let target = FILAddress::new_id(0x100);
     rt.actor_code_cids.insert(target, *EVM_ACTOR_CODE_ID);
 
-    let evm_target = EVMAddress::from_id_address(&target).unwrap();
+    let evm_target = EthAddress::from_id_address(&target).unwrap();
     let evm_target_word = evm_target.as_evm_word();
 
     // dest + method 0 with no data
@@ -216,7 +216,7 @@ fn test_callactor() {
     let target = FILAddress::new_id(0x100);
     rt.actor_code_cids.insert(target, *EVM_ACTOR_CODE_ID);
 
-    let evm_target = EVMAddress::from_id_address(&target).unwrap();
+    let evm_target = EthAddress::from_id_address(&target).unwrap();
     let evm_target_word = evm_target.as_evm_word();
 
     // dest + method 0x42 with no data