exports should group by name instead of all into one

makerdao · Aug 12, 2024 · 23d2dc0 · 23d2dc0
1 parent 41066f6
commit 23d2dc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/ScriptTools.sol b/src/ScriptTools.sol
@@ -137,7 +137,7 @@ library ScriptTools {
      */
     function exportContract(string memory name, string memory label, address addr) internal {
         name = vm.envOr("FOUNDRY_EXPORTS_NAME", name);
-        string memory json = vm.serializeAddress(EXPORT_JSON_KEY, label, addr);
+        string memory json = vm.serializeAddress(string(abi.encodePacked(EXPORT_JSON_KEY, "_", name)), label, addr);
         _doExport(name, json);
     }
 
@@ -162,7 +162,7 @@ library ScriptTools {
      */
     function exportValue(string memory name, string memory label, uint256 val) internal {
         name = vm.envOr("FOUNDRY_EXPORTS_NAME", name);
-        string memory json = vm.serializeUint(EXPORT_JSON_KEY, label, val);
+        string memory json = vm.serializeUint(string(abi.encodePacked(EXPORT_JSON_KEY, "_", name)), label, val);
         _doExport(name, json);
     }
 
@@ -187,7 +187,7 @@ library ScriptTools {
      */
     function exportValue(string memory name, string memory label, string memory val) internal {
         name = vm.envOr("FOUNDRY_EXPORTS_NAME", name);
-        string memory json = vm.serializeString(EXPORT_JSON_KEY, label, val);
+        string memory json = vm.serializeString(string(abi.encodePacked(EXPORT_JSON_KEY, "_", name)), label, val);
         _doExport(name, json);
     }
+0 −1		.gitattributes
+12 −6		.github/workflows/ci.yml
+1 −3		.github/workflows/sync.yml
+3 −0		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+1 −0		lib/ds-test
+1 −1		package.json
+0 −635		scripts/vm.py
+1 −1		src/Script.sol
+225 −518		src/StdAssertions.sol
+11 −32		src/StdChains.sol
+2 −14		src/StdCheats.sol
+3 −24		src/StdInvariant.sol
+25 −25		src/StdJson.sol
+98 −240		src/StdStorage.sol
+0 −179		src/StdToml.sol
+33 −61		src/StdUtils.sol
+5 −4		src/Test.sol
+378 −1,615		src/Vm.sol
+0 −234		src/mocks/MockERC20.sol
+0 −235		src/mocks/MockERC721.sol
+898 −44		test/StdAssertions.t.sol
+41 −47		test/StdChains.t.sol
+48 −64		test/StdCheats.t.sol
+11 −13		test/StdError.t.sol
+0 −49		test/StdJson.t.sol
+10 −10		test/StdMath.t.sol
+44 −214		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+0 −49		test/StdToml.t.sol
+30 −30		test/StdUtils.t.sol
+0 −15		test/Vm.t.sol
+0 −8		test/fixtures/test.json
+0 −6		test/fixtures/test.toml
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol