From 4980d8b67ae859d25f63aefbbdf4ac0e2d88c699 Mon Sep 17 00:00:00 2001
From: Georgios Konstantopoulos <me@gakonst.com>
Date: Tue, 4 Jan 2022 11:32:17 +0200
Subject: [PATCH] fix(examples): contract with abi test (#757)

---
 .github/workflows/ci.yml            |  2 +-
 examples/contract_human_readable.rs | 32 ++++++++++-------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4b31e48..ea7a7e10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -214,7 +214,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
         with:
           cache-on-failure: true
-      - name: cargo test
+      - name: Run all examples
         run: |
             export PATH=$HOME/bin:$PATH
             ./scripts/examples.sh
diff --git a/examples/contract_human_readable.rs b/examples/contract_human_readable.rs
index 33b9724e..41b98288 100644
--- a/examples/contract_human_readable.rs
+++ b/examples/contract_human_readable.rs
@@ -1,6 +1,9 @@
 use anyhow::Result;
-use ethers::{prelude::*, utils::Ganache};
-use ethers_solc::{ArtifactOutput, Project, ProjectCompileOutput, ProjectPathsConfig};
+use ethers::{
+    prelude::*,
+    solc::{Project, ProjectPathsConfig},
+    utils::Ganache,
+};
 use std::{convert::TryFrom, path::PathBuf, sync::Arc, time::Duration};
 
 // Generate the type-safe contract bindings by providing the ABI
@@ -22,22 +25,13 @@ async fn main() -> Result<()> {
     // we use `root` for both the project root and for where to search for contracts since
     // everything is in the same directory
     let paths = ProjectPathsConfig::builder().root(&root).sources(&root).build().unwrap();
+
     // get the solc project instance using the paths above
-    let solc = Project::builder()
-        .paths(paths)
-        .ephemeral()
-        .artifacts(ArtifactOutput::Nothing)
-        .build()
-        .unwrap();
+    let project = Project::builder().paths(paths).ephemeral().no_artifacts().build().unwrap();
     // compile the project and get the artifacts
-    let compiled = solc.compile().unwrap();
-    let compiled = match compiled {
-        ProjectCompileOutput::Compiled((output, _)) => output,
-        _ => panic!("expected compilation artifacts"),
-    };
-    let path = root.join("contract.sol");
-    let path = path.to_str();
-    let contract = compiled.get(path.unwrap(), "SimpleStorage").expect("could not find contract");
+    let output = project.compile().unwrap();
+    let contract = output.find("SimpleStorage").expect("could not find contract").into_owned();
+    let (abi, bytecode, _) = contract.into_parts_or_default();
 
     // 2. instantiate our wallet & ganache
     let ganache = Ganache::new().spawn();
@@ -52,11 +46,7 @@ async fn main() -> Result<()> {
     let client = Arc::new(client);
 
     // 5. create a factory which will be used to deploy instances of the contract
-    let factory = ContractFactory::new(
-        contract.abi.unwrap().clone(),
-        contract.bytecode().unwrap().clone(),
-        client.clone(),
-    );
+    let factory = ContractFactory::new(abi, bytecode, client.clone());
 
     // 6. deploy it with the constructor arguments
     let contract = factory.deploy("initial value".to_string())?.legacy().send().await?;