From 2192c2fbfdff4da2a5d9f5b15fb17e0e3d039e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 15:00:34 +0200
Subject: [PATCH] externalTests: Helper for neutralizing package locks

---
 test/externalTests/common.sh    | 7 +++++++
 test/externalTests/ens.sh       | 4 +---
 test/externalTests/gnosis-v2.sh | 4 +---
 test/externalTests/gnosis.sh    | 4 +---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 8f9b5d39e..2a4981128 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -96,6 +96,13 @@ function replace_version_pragmas
     find . test -name '*.sol' -type f -print0 | xargs -0 sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity >=0.0;/'
 }
 
+function neutralize_package_lock
+{
+    # Remove lock files (if they exist) to prevent them from overriding our changes in package.json
+    rm --force --verbose yarn.lock
+    rm --force --verbose package-lock.json
+}
+
 function force_truffle_solc_modules
 {
     local soljson="$1"
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 48477610a..218ab4427 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -44,9 +44,7 @@ function ens_test
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index f3aab6d34..6e9c5e02b 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -45,9 +45,7 @@ function gnosis_safe_test
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 7507a1b48..5730b3495 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -43,9 +43,7 @@ function gnosis_safe_test
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"