Merge pull request #51 from CMTA/test

Fix bug with conditionalTransfer and automatic approval
CMTA · Dec 21, 2024 · b03f2e9 · b03f2e9
2 parents 53e12a6 + 297f1ff
commit b03f2e9
Show file tree

Hide file tree

Showing 145 changed files with 1,742 additions and 1,742 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,10 @@ Please follow [https://changelog.md/](https://changelog.md/) conventions.
   - Update surya doc by running the 3 scripts in [./doc/script](./doc/script)
   - Update changelog
 
+## v2.0.5
+
+- Fix a bug present in the Conditional Transfer rule and improve the corresponding tests.
+
 ## v2.0.4
 
 - Fix a bug present in the Conditional Transfer rule and the corresponding test.

diff --git a/doc/coverage/coverage/index-sort-b.html b/doc/coverage/coverage/index-sort-b.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">470</td>
-            <td class="headerCovTableEntry">502</td>
-            <td class="headerCovTableEntryHi">93.6 %</td>
+            <td class="headerCovTableEntry">479</td>
+            <td class="headerCovTableEntry">511</td>
+            <td class="headerCovTableEntryHi">93.7 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
             <td></td>
             <td></td>
             <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntry">122</td>
-            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">126</td>
+            <td class="headerCovTableEntry">128</td>
             <td class="headerCovTableEntryHi">98.4 %</td>
           </tr>
           <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -94,7 +94,7 @@
       <td class="coverNumLo">0 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
+      <td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
@@ -165,18 +165,6 @@
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">12 / 12</td>
     </tr>
-    <tr>
-      <td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
-      <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.0%"><img src="snow.png" width=1 height=10 alt="99.0%"></td></tr></table>
-      </td>
-      <td class="coverPerHi">99.0&nbsp;%</td>
-      <td class="coverNumHi">96 / 97</td>
-      <td class="coverPerHi">94.4&nbsp;%</td>
-      <td class="coverNumHi">17 / 18</td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">29 / 29</td>
-    </tr>
     <tr>
       <td class="coverFile"><a href="src/rules/operation/abstract/index.html">src/rules/operation/abstract</a></td>
       <td class="coverBar" align="center">
@@ -201,6 +189,18 @@
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">32 / 32</td>
     </tr>
+    <tr>
+      <td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
+      <td class="coverBar" align="center">
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
+      </td>
+      <td class="coverPerHi">99.1&nbsp;%</td>
+      <td class="coverNumHi">105 / 106</td>
+      <td class="coverPerHi">94.4&nbsp;%</td>
+      <td class="coverNumHi">17 / 18</td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">33 / 33</td>
+    </tr>
   </table>
   </center>
   <br>

diff --git a/doc/coverage/coverage/index-sort-f.html b/doc/coverage/coverage/index-sort-f.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">470</td>
-            <td class="headerCovTableEntry">502</td>
-            <td class="headerCovTableEntryHi">93.6 %</td>
+            <td class="headerCovTableEntry">479</td>
+            <td class="headerCovTableEntry">511</td>
+            <td class="headerCovTableEntryHi">93.7 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
             <td></td>
             <td></td>
             <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntry">122</td>
-            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">126</td>
+            <td class="headerCovTableEntry">128</td>
             <td class="headerCovTableEntryHi">98.4 %</td>
           </tr>
           <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -144,17 +144,17 @@
     <tr>
       <td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.0%"><img src="snow.png" width=1 height=10 alt="99.0%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
       </td>
-      <td class="coverPerHi">99.0&nbsp;%</td>
-      <td class="coverNumHi">96 / 97</td>
+      <td class="coverPerHi">99.1&nbsp;%</td>
+      <td class="coverNumHi">105 / 106</td>
       <td class="coverPerHi">94.4&nbsp;%</td>
       <td class="coverNumHi">17 / 18</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">29 / 29</td>
+      <td class="coverNumHi">33 / 33</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
+      <td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>

diff --git a/doc/coverage/coverage/index-sort-l.html b/doc/coverage/coverage/index-sort-l.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">470</td>
-            <td class="headerCovTableEntry">502</td>
-            <td class="headerCovTableEntryHi">93.6 %</td>
+            <td class="headerCovTableEntry">479</td>
+            <td class="headerCovTableEntry">511</td>
+            <td class="headerCovTableEntryHi">93.7 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
             <td></td>
             <td></td>
             <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntry">122</td>
-            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">126</td>
+            <td class="headerCovTableEntry">128</td>
             <td class="headerCovTableEntryHi">98.4 %</td>
           </tr>
           <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -144,38 +144,38 @@
     <tr>
       <td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.0%"><img src="snow.png" width=1 height=10 alt="99.0%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
       </td>
-      <td class="coverPerHi">99.0&nbsp;%</td>
-      <td class="coverNumHi">96 / 97</td>
+      <td class="coverPerHi">99.1&nbsp;%</td>
+      <td class="coverNumHi">105 / 106</td>
       <td class="coverPerHi">94.4&nbsp;%</td>
       <td class="coverNumHi">17 / 18</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">29 / 29</td>
+      <td class="coverNumHi">33 / 33</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
+      <td class="coverFile"><a href="src/rules/validation/abstract/index.html">src/rules/validation/abstract</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">1 / 1</td>
-      <td class="coverPerHi">-</td>
-      <td class="coverNumHi">0 / 0</td>
+      <td class="coverNumHi">3 / 3</td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">4 / 4</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="src/rules/validation/abstract/index.html">src/rules/validation/abstract</a></td>
+      <td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">3 / 3</td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">4 / 4</td>
+      <td class="coverNumHi">1 / 1</td>
+      <td class="coverPerHi">-</td>
+      <td class="coverNumHi">0 / 0</td>
     </tr>
     <tr>
       <td class="coverFile"><a href="src/modules/index.html">src/modules</a></td>

diff --git a/doc/coverage/coverage/index.html b/doc/coverage/coverage/index.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">470</td>
-            <td class="headerCovTableEntry">502</td>
-            <td class="headerCovTableEntryHi">93.6 %</td>
+            <td class="headerCovTableEntry">479</td>
+            <td class="headerCovTableEntry">511</td>
+            <td class="headerCovTableEntryHi">93.7 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
             <td></td>
             <td></td>
             <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntry">122</td>
-            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">126</td>
+            <td class="headerCovTableEntry">128</td>
             <td class="headerCovTableEntryHi">98.4 %</td>
           </tr>
           <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -120,14 +120,14 @@
     <tr>
       <td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.0%"><img src="snow.png" width=1 height=10 alt="99.0%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
       </td>
-      <td class="coverPerHi">99.0&nbsp;%</td>
-      <td class="coverNumHi">96 / 97</td>
+      <td class="coverPerHi">99.1&nbsp;%</td>
+      <td class="coverNumHi">105 / 106</td>
       <td class="coverPerHi">94.4&nbsp;%</td>
       <td class="coverNumHi">17 / 18</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">29 / 29</td>
+      <td class="coverNumHi">33 / 33</td>
     </tr>
     <tr>
       <td class="coverFile"><a href="src/rules/operation/abstract/index.html">src/rules/operation/abstract</a></td>
@@ -178,7 +178,7 @@
       <td class="coverNumHi">6 / 6</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
+      <td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>

diff --git a/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func-sort-c.html b/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func.html b/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.gcov.html b/doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/RuleEngineScript.s.sol.func-sort-c.html b/doc/coverage/coverage/script/RuleEngineScript.s.sol.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/RuleEngineScript.s.sol.func.html b/doc/coverage/coverage/script/RuleEngineScript.s.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/RuleEngineScript.s.sol.gcov.html b/doc/coverage/coverage/script/RuleEngineScript.s.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/index-sort-b.html b/doc/coverage/coverage/script/index-sort-b.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/index-sort-f.html b/doc/coverage/coverage/script/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/index-sort-l.html b/doc/coverage/coverage/script/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>

diff --git a/doc/coverage/coverage/script/index.html b/doc/coverage/coverage/script/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-12-11 15:33:42</td>
+            <td class="headerValue">2024-12-20 10:41:14</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">0</td>