chore: error with EmptyResult instead of always letting serde error

gakonst · May 22, 2023 · 94ad922 · 94ad922
1 parent 03680fa
commit 94ad922
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ethers-etherscan/src/contract.rs b/ethers-etherscan/src/contract.rs
@@ -333,7 +333,15 @@ impl Client {
         let query = self.create_query("contract", "getabi", HashMap::from([("address", address)]));
         let resp: Response<Option<String>> = self.get_json(&query).await?;
 
-        let result = resp.result.unwrap_or("".to_string());
+        let result = match resp.result {
+            Some(result) => result,
+            None => {
+                return Err(EtherscanError::EmptyResult {
+                    message: resp.message,
+                    status: resp.status,
+                })
+            }
+        };
 
         if result.starts_with("Max rate limit reached") {
             return Err(EtherscanError::RateLimitExceeded)

diff --git a/ethers-etherscan/src/errors.rs b/ethers-etherscan/src/errors.rs
@@ -23,6 +23,8 @@ pub enum EtherscanError {
     Serde(#[from] serde_json::Error),
     #[error("Contract source code not verified: {0}")]
     ContractCodeNotVerified(Address),
+    #[error("Response result is unexpectedly empty")]
+    EmptyResult { status: String, message: String },
     #[error("Rate limit exceeded")]
     RateLimitExceeded,
     #[error(transparent)]