From 93c9e6fecfe33d318e5a9bdb5d53df6c4d0eaae4 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 21 Nov 2023 08:43:38 -0500
Subject: [PATCH] Test modified compile with multiple namespaces (#927)

---
 .github/workflows/checks.yml                  |   1 +
 .../contracts/test/NamespacedToModify.sol     |   6 ++++++
 .../core/src/utils/make-namespaced.test.ts    |   4 +++-
 .../core/src/utils/make-namespaced.test.ts.md |   6 ++++++
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1013 -> 1035 bytes
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 9847444ee..cc26540f6 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -28,6 +28,7 @@ jobs:
         package:
           - core
           - plugin-hardhat
+      fail-fast: false
 
     runs-on: ubuntu-latest
 
diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 91863fc3b..c8c1d0e75 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -8,6 +8,12 @@ contract Example {
         uint256 y;
     }
 
+    /// @custom:storage-location erc7201:example.secondary
+    struct SecondaryStorage {
+        uint256 a;
+        uint256 b;
+    }
+
     /// @notice some natspec
     function foo() public {}
 
diff --git a/packages/core/src/utils/make-namespaced.test.ts b/packages/core/src/utils/make-namespaced.test.ts
index da02b8418..6dbbe56ae 100644
--- a/packages/core/src/utils/make-namespaced.test.ts
+++ b/packages/core/src/utils/make-namespaced.test.ts
@@ -49,7 +49,9 @@ async function testMakeNamespaced(
 function normalizeStateVariableNames(input: SolcInput): void {
   for (const source of Object.values(input.sources)) {
     if (source.content !== undefined) {
-      source.content = source.content.replace(/\$MainStorage_\d{1,6};/g, '$MainStorage_random;');
+      source.content = source.content
+        .replace(/\$MainStorage_\d{1,6};/g, '$MainStorage_random;')
+        .replace(/\$SecondaryStorage_\d{1,6}/g, '$SecondaryStorage_random');
     }
   }
 }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index bdcf08b29..83a23e9aa 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -37,6 +37,12 @@ Generated by [AVA](https://avajs.dev).
                   uint256 x;␊
                   uint256 y;␊
               } MainStorage $MainStorage_random;␊
+          ␊
+              /// @custom:storage-location erc7201:example.secondary␊
+              struct SecondaryStorage {␊
+                  uint256 a;␊
+                  uint256 b;␊
+              } SecondaryStorage $SecondaryStorage_random;␊
           ␊
               ␊
               ␊
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 760ce4135a3d057f59ab08d0d02979f71be5092b..de4bc1ff70b3c9ccb195c1000e2568c2ab735d25 100644
GIT binary patch
literal 1035
zcmV+m1oZnsRzV<BZeeh9Xm4~Nb~6eC09Wb+oBOz>`l`j)?4?rEwp$rDpIVO|0Htf(
z(c$3sMjwj^00000000B!RZWi@H5eYxWRo<|W-Cxn9IT~<%|bpJ)Lpb&P|JS6O8bFG
zD#3-7GvjRC%-E6bX*X00f&&Lm94dsk6>)-}fZ)QVzXLd+a^WZNjx$LnGaGGJYPm3y
zXKcUE`}%op&+|U)c6{OX)ED1V&9qO$fb=NlB%rEKT<T%Q`=MrvlfJqwwEFy^=Mhal
zDr`Ac!HOPKM7d@7UWZ1ZeFp6Xl)s4b`<*+~)d-Ed^Yil-I&UGzLS?|%FGjt&i>T-m
zei)KNI-Y0=pLt9VEOY^(Zz1B?qNvu4A1Y({Enz7r5lWY;h>-Ib4F5oT4yDN0(`1Us
zejOmqG_086Y?}ocnk;xu^fe3ECsZ2KgM_IpLJiy2qCP}mf}04)z<y4^uDF70NnEY!
znkrr28*h7C><W){2Q?*plhE(r_7}9gonq=_5_%aRl{74ufn5j4J89Utlk%QAs{-Yu
z<5SO!?Q+VRlOb1Tkh33IiL_aMk~Ufz8KxsgyFs~*$96tfujAJH8y{A8m`k~$)ol;V
ztjnle#k<?>QeTq8fM6A07W{Fe_GYcwSSyuA8;duONYM8wzF)%d)FI*xH&j{#tMCGM
zT7~ORqBFu&x+~4b)m1ulsRe{_<E69=A=EC6TSKQfT=ayD>*lp(e6*IC8Vsk7r#vqw
z1_zRGPXxgC%;Xe>6g?sbNrtV_<ZPNGOS3bgnQ_0Io|z^*e4X4)?i+ZU&V92atcQ<B
z8RH&xUD5*@i=@M9l)J*Ci!rmsiE$x$C<~PeuHvikeg%Kp8NjdeMsw`bIO=vQm9-?H
z#M|sK7aA@U(1T=r!6UiTs!!caDgZVhVo;ul5%r~|;U+F6Vt^GJDUD6_85?t)xSa11
zwH0!s5ay^#Df=x2N;gI@m3090=orB(Vx#evq;!Nb5r#4(Bz_A=|3=1PeSfdjzPZ;v
zxYgR;d-tHVxwE<6-v1zm`>Z432H+jm8LpXTxejr{fXaz=7PGz|s`fn*2hJoa<OY+G
zVBV!Fv6Ruj2cRF{LHjA6QmnZdO8x6Za4a+NM@oS}0*g?=E)?Q`b2p_VgGsMkE*sDS
z02WiA!W5`vwCwpv%f>4>MCp?)=i`5ShYX-f#AWvgpICR{nuEBxxKUflmSE@6|FQ)4
zW|!b^o~#7_l7PK>Y6)(vjEnG};P@C?@$@2m1t71TUWDHU$i{zGg#WhBT!g>0&RT@w
zuGW@8f1j?*nf<@ySk_C>s?HONzzruQ0@TTfz*jK!wR4IH`~ZL-oo6Ki{{jryJp6?V
F0067+{1*TK

literal 1013
zcmV<R0}A{>RzV<BZeeh9Xm4~Nb~6eC0Gs%%z0{fW=I)fxJZc5e8YUqVsgAx~^lLlM
zGVvXF9v_Pc00000000B!Rn2c3MHJuJjUCqzoQjH552HdM4)~+4nxLehmL!Ep`KYiX
z-~iEhcbrbWJLAsG(wHhBIB?*^0T9<BPW%N(RZm>{cK`<{7tTHP?Rc|Z?<Pts0T)(!
zvorI4@6CJj@q2fBU0=9;^~DcVGwstbAbpBC38)$nmwK4-L8zJHWT0*ctv<i&c|?;B
zir+fcv=x1*gr*kYe;I^=d<OD7DxOBg?e0zLYJ`&R?Ch+CW-R1br~(-KOw=o!MkSx{
zy^!qDWTGv6<}p3A&~pfV4;~YZqFOV)r;O&8lxA9qP`Xq_0XYvr@i)jbC=-l58B7V;
zuK}c$g_UwK+h#$A#tWVj1I+^V36)0mO-fY}p@wa1Qy)Aq!HoxGVE0n6^RD1p5?8B+
zrb;)ql5OvZP2sWLu&#t}68aU){s1Z3nMj>nLN5ZOnuSf}V3z^%Ru*>ZsJti6YMOG=
z^{HpZb|s^ok|9@SFl9fmQfdEO7^jWq4;7Q1qurof$76fPX*6*A`s(|&4dzm=Xl>mC
zHR~}dm+<C#r#z5kFCbXOmj!>+tiN7wHJ8if!;Qsj`y?3n6yGUh_!{8xiW@2|f+c9c
zoYvs_ljw{vmF{Azd0~l;OzHt)+*m0sLvXbT<MzlXb{Bmi<GOWe0q-y8riP=bg9*!*
zQiEMdxF-ULH^PmYqr2%ahV4=3j#&tIm+?V4&JOpf>ykb!K1aH&PPr>QIv2+?H&&iY
z=XkDK#Wj2Z+L!UC-67n>i><__x!>zmtIO$tQmxrfE;O7Ega^s^f=BG3)quLWQ~+#1
z#GpJ8BO3Gbqph1y`2a08%oM8{$85|&>a5=(>RQOngEI$I&ggd(5J!SwDsKSj!@~os
zC>o8gNlFh<#>41U3yI&r(N)VCtZZ+!J6E?lyF2amt+#jEYa44To$YsHxX-$h$RXZf
z-O-xaC|AHw7*ILZ9v9ib4^`*3h#lt=6>^oyh<`q&Dz%iMli%Pu{t5D^kRgD=F~m1h
zOx~|$CR)YG2Mvt!9!z~$j2#xPN=b&}UZqkopj!aAodHcxfXap%o{gv>S-~MnAFY{*
z-|+?+0_nz8Y#$$4#^9O*SGc%YU(8oD=fVH7qV<ojXx}|qMZ2GZy>enjYc3`=?RPMI
z2vRz^rkw}Kt0&jAHvzKxpVhR#?5D12Us_LF)8MYw7l42NS(-EZ|AJ##XF+Pt6OzCc
jCqn|%$&tWUF!i-_0tx&GfS;Uyiv%766wNAS)CvFq$<gdK