feat: bump forc to 0.24.0 (#565)

FuelLabs · Sep 7, 2022 · 1cf6a8e · 1cf6a8e
1 parent 5c23aa0
commit 1cf6a8e
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ env:
   RUSTFLAGS: "-D warnings"
   FUEL_CORE_VERSION: 0.10.1
   RUST_VERSION: 1.61.0
-  FORC_VERSION: 0.22.1
+  FORC_VERSION: 0.24.0
 
 jobs:
   setup-test-projects:

diff --git a/examples/contracts/src/lib.rs b/examples/contracts/src/lib.rs
@@ -29,7 +29,7 @@ mod tests {
         abigen!(
             MyContract,
             // This path is relative to the workspace (repository) root
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         // This helper will launch a local node and provide a test wallet linked to it
@@ -79,7 +79,7 @@ mod tests {
 
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -116,7 +116,7 @@ mod tests {
         // ANCHOR: abigen_example
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
         // ANCHOR_END: abigen_example
 
@@ -158,7 +158,7 @@ mod tests {
 
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallets = launch_custom_provider_and_get_wallets(WalletsConfig::default(), None).await;
@@ -212,7 +212,7 @@ mod tests {
         use fuels::prelude::*;
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -290,7 +290,7 @@ mod tests {
         use fuels::prelude::*;
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/token_ops/out/debug/token_ops-flat-abi.json"
+            "packages/fuels/tests/test_projects/token_ops/out/debug/token_ops-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -330,7 +330,7 @@ mod tests {
         use fuels::tx::Receipt;
         abigen!(
             TestContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
         let wallet = launch_provider_and_get_wallet().await;
         let contract_id = Contract::deploy(
@@ -375,7 +375,7 @@ mod tests {
         // Replace with your contract ABI.json path
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
         let wallet = launch_provider_and_get_wallet().await;
         // Your contract ID as a String.
@@ -394,7 +394,7 @@ mod tests {
         use fuels::prelude::*;
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -434,7 +434,7 @@ mod tests {
 
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -484,7 +484,7 @@ mod tests {
 
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let wallet = launch_provider_and_get_wallet().await;
@@ -527,7 +527,7 @@ mod tests {
         use fuels::prelude::*;
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-flat-abi.json"
+            "packages/fuels/tests/test_projects/contract_test/out/debug/contract_test-abi.json"
         );
 
         let config = WalletsConfig::new(Some(2), Some(1), Some(DEFAULT_COIN_AMOUNT));

diff --git a/examples/cookbook/src/lib.rs b/examples/cookbook/src/lib.rs
@@ -10,7 +10,7 @@ mod tests {
         // ANCHOR: liquidity_abigen
         abigen!(
             MyContract,
-            "packages/fuels/tests/test_projects/liquidity_pool/out/debug/liquidity_pool-flat-abi.json"
+            "packages/fuels/tests/test_projects/liquidity_pool/out/debug/liquidity_pool-abi.json"
         );
         // ANCHOR_END: liquidity_abigen
 

diff --git a/packages/fuels-types/src/lib.rs b/packages/fuels-types/src/lib.rs
@@ -42,15 +42,15 @@ pub struct ProgramABI {
     pub functions: Vec<ABIFunction>,
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ABIFunction {
     pub inputs: Vec<TypeApplication>,
     pub name: String,
     pub output: TypeApplication,
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeDeclaration {
     pub type_id: usize,