fixbreaking compactref api

ethers-contract/src/factory.rs

@@ -122,7 +122,7 @@ impl<M: Middleware> Deployer<M> {
 /// let client = std::sync::Arc::new(client);
 ///
 /// // create a factory which will be used to deploy instances of the contract
-/// let factory = ContractFactory::new(contract.abi.unwrap().clone(), contract.bin.unwrap().clone(), client);
+/// let factory = ContractFactory::new(contract.abi.unwrap().clone(), contract.bytecode().unwrap().clone(), client);
 ///
 /// // The deployer created by the `deploy` call exposes a builder which gets consumed
 /// // by the async `send` call

ethers-contract/tests/abigen.rs

@@ -293,7 +293,7 @@ async fn can_handle_underscore_functions() {
     let compiled = compiled.get(path, contract).unwrap();
     let factory = ethers_contract::ContractFactory::new(
         compiled.abi.unwrap().clone(),
-        compiled.bin.unwrap().clone(),
+        compiled.bytecode().unwrap().clone(),
         client.clone(),
     );
     let addr = factory.deploy("hi".to_string()).unwrap().legacy().send().await.unwrap().address();

ethers-contract/tests/common/mod.rs

@@ -33,7 +33,8 @@ pub fn compile_contract(name: &str, filename: &str) -> (Abi, Bytes) {
     let path = format!("./tests/solidity-contracts/{}", filename);
     let compiled = Solc::default().compile_source(&path).unwrap();
     let contract = compiled.get(&path, name).expect("could not find contract");
-    (contract.abi.unwrap().clone(), contract.bin.unwrap().clone())
+    let (abi, bin, _) = contract.into_parts_or_default();
+    (abi, bin)
 }
 
 /// connects the private key to http://localhost:8545

ethers-middleware/tests/signer.rs

@@ -223,7 +223,8 @@ async fn deploy_and_call_contract() {
         let path = format!("./tests/solidity-contracts/{}", path);
         let compiled = Solc::default().compile_source(&path).unwrap();
         let contract = compiled.get(&path, name).expect("could not find contract");
-        (contract.abi.unwrap().clone(), contract.bin.unwrap().clone())
+        let (abi, bin, _) = contract.into_parts_or_default();
+        (abi, bin)
     }
 
     let (abi, bytecode) = compile_contract("SimpleStorage.sol", "SimpleStorage");

ethers-middleware/tests/transformer.rs

@@ -19,7 +19,8 @@ fn compile_contract(path: &str, name: &str) -> (Abi, Bytes) {
     let path = format!("./tests/solidity-contracts/{}", path);
     let compiled = Solc::default().compile_source(&path).unwrap();
     let contract = compiled.get(&path, name).expect("could not find contract");
-    (contract.abi.unwrap().clone(), contract.bin.unwrap().clone())
+    let (abi, bin, _) = contract.into_parts_or_default();
+    (abi, bin)
 }
 
 #[tokio::test]

ethers-solc/src/artifacts.rs

@@ -635,6 +635,14 @@ impl<'a> CompactContractRef<'a> {
     pub fn into_parts_or_default(self) -> (Abi, Bytes, Bytes) {
         CompactContract::from(self).into_parts_or_default()
     }
+
+    pub fn bytecode(&self) -> Option<&Bytes> {
+        self.bin.as_ref().and_then(|bin| bin.as_bytes())
+    }
+
+    pub fn runtime_bytecode(&self) -> Option<&Bytes> {
+        self.bin_runtime.as_ref().and_then(|bin| bin.as_bytes())
+    }
 }
 
 impl<'a> From<&'a Contract> for CompactContractRef<'a> {

examples/contract_human_readable.rs

@@ -54,7 +54,7 @@ async fn main() -> Result<()> {
     // 5. create a factory which will be used to deploy instances of the contract
     let factory = ContractFactory::new(
         contract.abi.unwrap().clone(),
-        contract.bin.unwrap().clone(),
+        contract.bytecode().unwrap().clone(),
         client.clone(),
     );