chore:cleanup

Signed-off-by: Lohachov Mykhailo <[email protected]>
hyperledger-iroha · Nov 19, 2024 · c7fe1ce · c7fe1ce
1 parent 5cfe4df
commit c7fe1ce
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.config/nextest.toml b/.config/nextest.toml
@@ -1,5 +1,5 @@
 [profile.default]
-retries = { backoff = "fixed", count = 2, delay = "3s" }
+retries = { backoff = "fixed", count = 4, delay = "3s" }
 
 [profile.ci]
 fail-fast = false

diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
@@ -227,7 +227,11 @@ jobs:
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml down
       - name: Run docker-compose.yml containers
         run: docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.yml up --wait || exit 1

diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml
@@ -64,11 +64,19 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Test docker-compose.single.yml before pushing
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml before pushing
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml down
       - name: Test docker-compose.yml before pushing
         run: |

diff --git a/crates/iroha_test_network/src/lib.rs b/crates/iroha_test_network/src/lib.rs
@@ -347,9 +347,6 @@ impl NetworkBuilder {
                 InstructionBox::SetParameter(SetParameter::new(Parameter::Sumeragi(
                     SumeragiParameter::CommitTimeMs(commit_time.as_millis() as u64),
                 ))),
-                InstructionBox::SetParameter(SetParameter::new(Parameter::Executor(
-                    SmartContractParameter::Fuel(std::num::NonZero::new(u64::MAX).unwrap()),
-                ))),
             ]
             .into_iter()
             .chain(self.extra_isi),