fix: failing test

Nuffle-Labs · Oct 31, 2024 · 9ee91b3 · 9ee91b3
1 parent 3466ddf
commit 9ee91b3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/offchain/src/chain/connections.rs b/offchain/src/chain/connections.rs
@@ -11,7 +11,7 @@ use alloy::{
     pubsub::{PubSubFrontend, SubscriptionStream},
     rpc::types::{Filter, Log},
 };
-use eyre::{OptionExt, Result};
+use eyre::{eyre, OptionExt, Result};
 
 /// Create the subscriptions for the DVN workflow.
 pub async fn build_dvn_subscriptions(
@@ -86,7 +86,7 @@ pub async fn build_executor_subscriptions(
 /// Load the MessageLib ABI.
 pub fn get_abi_from_path(path: &str) -> Result<JsonAbi> {
     // Get the SendLib ABI
-    let artifact = std::fs::read(path)?;
+    let artifact = std::fs::read(path).map_err(|e| eyre!("Cannot load config for offchain worker. Error: {:?}", e))?;
     let json: serde_json::Value = serde_json::from_slice(&artifact)?;
     // SAFETY: Assume `unwrap` is safe since the key has been harcoded
     let abi_value = json.get("abi").ok_or_eyre("ABI not found in artifact")?;
@@ -108,9 +108,9 @@ mod tests {
 
     #[test]
     fn test_expect_to_find_all_abis() {
-        get_abi_from_path("abi/ReceiveLibUln302.json").unwrap();
-        get_abi_from_path("abi/SendLibUln302.json").unwrap();
-        get_abi_from_path("abi/L0V2Endpoint.json").unwrap();
+        get_abi_from_path("./offchain/abi/ReceiveLibUln302.json").unwrap();
+        get_abi_from_path("./offchain/abi/SendLibUln302.json").unwrap();
+        get_abi_from_path("./offchain/abi/L0V2Endpoint.json").unwrap();
     }
 
     #[test]

diff --git a/offchain/src/config.rs b/offchain/src/config.rs
@@ -5,7 +5,7 @@ use config::Config;
 use eyre::Result;
 use serde::Deserialize;
 
-const CONFIG_PATH: &str = "./workers_config";
+const CONFIG_PATH: &str = "./offchain/workers_config.toml";
 
 #[derive(Debug, Deserialize)]
 pub struct WorkerConfig {

diff --git a/offchain/src/workers/dvn.rs b/offchain/src/workers/dvn.rs
@@ -115,7 +115,7 @@ impl Dvn {
         let http_provider = get_http_provider(&self.config)?;
 
         // Get the relevant contract ABI, and create contract.
-        let abi = get_abi_from_path("./abi/ReceiveLibUln302.json")?;
+        let abi = get_abi_from_path("./offchain/abi/ReceiveLibUln302.json")?;
         self.receive_lib = Some(create_contract_instance(
             self.config.receivelib_uln302_addr,
             http_provider,

diff --git a/offchain/src/workers/executor.rs b/offchain/src/workers/executor.rs
@@ -52,7 +52,7 @@ impl NFFLExecutor {
             build_executor_subscriptions(&self.config).await?;
 
         let http_provider = get_http_provider(&self.config)?;
-        let l0_abi = get_abi_from_path("./abi/L0V2Endpoint.json")?;
+        let l0_abi = get_abi_from_path("./offchain/abi/L0V2Endpoint.json")?;
         // Create a contract instance.
         let contract = create_contract_instance(self.config.l0_endpoint_addr, http_provider, l0_abi)?;