safe-tools: Make address label prefix configurable

packages/contracts-bedrock/test/LivenessGuard.t.sol

@@ -231,7 +231,8 @@ contract LivenessGuard_FuzzOwnerManagement_Test is StdCheats, StdUtils, Liveness
         threshold = bound(threshold, 1, initialOwners);
 
         // Generate the initial owners and keys and setup the safe
-        (address[] memory ownerAddrs, uint256[] memory ownerkeys) = SafeTestLib.makeAddrsAndKeys(initialOwners);
+        (address[] memory ownerAddrs, uint256[] memory ownerkeys) =
+            SafeTestLib.makeAddrsAndKeys("safeTest", initialOwners);
         // record the private keys for later use
         for (uint256 i = 0; i < ownerAddrs.length; i++) {
             privateKeys[ownerAddrs[i]] = ownerkeys[i];

packages/contracts-bedrock/test/LivenessModule.t.sol

@@ -47,7 +47,7 @@ contract LivenessModule_TestInit is Test, SafeTestTools {
         vm.warp(initTime);
 
         // Create a Safe with 10 owners
-        (, uint256[] memory keys) = SafeTestLib.makeAddrsAndKeys(10);
+        (, uint256[] memory keys) = SafeTestLib.makeAddrsAndKeys("moduleTest", 10);
         safeInstance = _setupSafe(keys, 8);
 
         livenessGuard = new LivenessGuard(safeInstance.safe);

packages/contracts-bedrock/test/SafeSigners.t.sol

@@ -39,7 +39,7 @@ contract SafeSigners_Test is Test, SafeTestTools {
         // Limit the number of signatures to 25
         uint256 numSigs = bound(_numSigs, 1, 25);
 
-        (, uint256[] memory keys) = SafeTestLib.makeAddrsAndKeys(numSigs);
+        (, uint256[] memory keys) = SafeTestLib.makeAddrsAndKeys("getSigsTest", numSigs);
         for (uint256 i = 0; i < keys.length; i++) {
             if (sigType(keys[i]) == SigTypes.Contract) {
                 keys[i] =

packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol

@@ -69,7 +69,13 @@ library SafeTestLib {
     }
 
     /// @dev Get arrays of addresses and private keys. The arrays are sorted by address, and the addresses are labelled
-    function makeAddrsAndKeys(uint256 num) internal returns (address[] memory addrs, uint256[] memory keys) {
+    function makeAddrsAndKeys(
+        string memory prefix,
+        uint256 num
+    )
+        internal
+        returns (address[] memory addrs, uint256[] memory keys)
+    {
         keys = new uint256[](num);
         addrs = new address[](num);
         for (uint256 i; i < num; i++) {
@@ -79,7 +85,7 @@ library SafeTestLib {
 
         for (uint256 i; i < num; i++) {
             addrs[i] = Vm(VM_ADDR).addr(keys[i]);
-            Vm(VM_ADDR).label(getAddr(keys[i]), string.concat("SAFETEST: Signer ", Vm(VM_ADDR).toString(i)));
+            Vm(VM_ADDR).label(getAddr(keys[i]), string.concat(prefix, Vm(VM_ADDR).toString(i)));
         }
     }
 
@@ -592,7 +598,7 @@ contract SafeTestTools {
     }
 
     function _setupSafe() public returns (SafeInstance memory) {
-        (, uint256[] memory defaultPKs) = SafeTestLib.makeAddrsAndKeys(3);
+        (, uint256[] memory defaultPKs) = SafeTestLib.makeAddrsAndKeys("default", 3);
 
         return _setupSafe(
             defaultPKs,