Skip to content

Commit b03f2e9

Browse files
rya-sgerya-sge
authored
Merge pull request #51 from CMTA/test
Fix bug with conditionalTransfer and automatic approval
2 parents 53e12a6 + 297f1ff commit b03f2e9

145 files changed

Lines changed: 1742 additions & 1742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Please follow [https://changelog.md/](https://changelog.md/) conventions.
1717
- Update surya doc by running the 3 scripts in [./doc/script](./doc/script)
1818
- Update changelog
1919

20+
## v2.0.5
21+
22+
- Fix a bug present in the Conditional Transfer rule and improve the corresponding tests.
23+
2024
## v2.0.4
2125

2226
- Fix a bug present in the Conditional Transfer rule and the corresponding test.

‎doc/coverage/coverage/index-sort-b.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<td class="headerValue">lcov.info</td>
3232
<td></td>
3333
<td class="headerItem">Lines:</td>
34-
<td class="headerCovTableEntry">470</td>
35-
<td class="headerCovTableEntry">502</td>
36-
<td class="headerCovTableEntryHi">93.6 %</td>
34+
<td class="headerCovTableEntry">479</td>
35+
<td class="headerCovTableEntry">511</td>
36+
<td class="headerCovTableEntryHi">93.7 %</td>
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
4949
<td></td>
5050
<td></td>
5151
<td class="headerItem">Branches:</td>
52-
<td class="headerCovTableEntry">122</td>
53-
<td class="headerCovTableEntry">124</td>
52+
<td class="headerCovTableEntry">126</td>
53+
<td class="headerCovTableEntry">128</td>
5454
<td class="headerCovTableEntryHi">98.4 %</td>
5555
</tr>
5656
<tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -94,7 +94,7 @@
9494
<td class="coverNumLo">0 / 2</td>
9595
</tr>
9696
<tr>
97-
<td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
97+
<td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
9898
<td class="coverBar" align="center">
9999
<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>
100100
</td>
@@ -165,18 +165,6 @@
165165
<td class="coverPerHi">100.0&nbsp;%</td>
166166
<td class="coverNumHi">12 / 12</td>
167167
</tr>
168-
<tr>
169-
<td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
170-
<td class="coverBar" align="center">
171-
<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>
172-
</td>
173-
<td class="coverPerHi">99.0&nbsp;%</td>
174-
<td class="coverNumHi">96 / 97</td>
175-
<td class="coverPerHi">94.4&nbsp;%</td>
176-
<td class="coverNumHi">17 / 18</td>
177-
<td class="coverPerHi">100.0&nbsp;%</td>
178-
<td class="coverNumHi">29 / 29</td>
179-
</tr>
180168
<tr>
181169
<td class="coverFile"><a href="src/rules/operation/abstract/index.html">src/rules/operation/abstract</a></td>
182170
<td class="coverBar" align="center">
@@ -201,6 +189,18 @@
201189
<td class="coverPerHi">100.0&nbsp;%</td>
202190
<td class="coverNumHi">32 / 32</td>
203191
</tr>
192+
<tr>
193+
<td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
194+
<td class="coverBar" align="center">
195+
<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>
196+
</td>
197+
<td class="coverPerHi">99.1&nbsp;%</td>
198+
<td class="coverNumHi">105 / 106</td>
199+
<td class="coverPerHi">94.4&nbsp;%</td>
200+
<td class="coverNumHi">17 / 18</td>
201+
<td class="coverPerHi">100.0&nbsp;%</td>
202+
<td class="coverNumHi">33 / 33</td>
203+
</tr>
204204
</table>
205205
</center>
206206
<br>

‎doc/coverage/coverage/index-sort-f.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<td class="headerValue">lcov.info</td>
3232
<td></td>
3333
<td class="headerItem">Lines:</td>
34-
<td class="headerCovTableEntry">470</td>
35-
<td class="headerCovTableEntry">502</td>
36-
<td class="headerCovTableEntryHi">93.6 %</td>
34+
<td class="headerCovTableEntry">479</td>
35+
<td class="headerCovTableEntry">511</td>
36+
<td class="headerCovTableEntryHi">93.7 %</td>
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
4949
<td></td>
5050
<td></td>
5151
<td class="headerItem">Branches:</td>
52-
<td class="headerCovTableEntry">122</td>
53-
<td class="headerCovTableEntry">124</td>
52+
<td class="headerCovTableEntry">126</td>
53+
<td class="headerCovTableEntry">128</td>
5454
<td class="headerCovTableEntryHi">98.4 %</td>
5555
</tr>
5656
<tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -144,17 +144,17 @@
144144
<tr>
145145
<td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
146146
<td class="coverBar" align="center">
147-
<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>
147+
<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>
148148
</td>
149-
<td class="coverPerHi">99.0&nbsp;%</td>
150-
<td class="coverNumHi">96 / 97</td>
149+
<td class="coverPerHi">99.1&nbsp;%</td>
150+
<td class="coverNumHi">105 / 106</td>
151151
<td class="coverPerHi">94.4&nbsp;%</td>
152152
<td class="coverNumHi">17 / 18</td>
153153
<td class="coverPerHi">100.0&nbsp;%</td>
154-
<td class="coverNumHi">29 / 29</td>
154+
<td class="coverNumHi">33 / 33</td>
155155
</tr>
156156
<tr>
157-
<td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
157+
<td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
158158
<td class="coverBar" align="center">
159159
<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>
160160
</td>

‎doc/coverage/coverage/index-sort-l.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<td class="headerValue">lcov.info</td>
3232
<td></td>
3333
<td class="headerItem">Lines:</td>
34-
<td class="headerCovTableEntry">470</td>
35-
<td class="headerCovTableEntry">502</td>
36-
<td class="headerCovTableEntryHi">93.6 %</td>
34+
<td class="headerCovTableEntry">479</td>
35+
<td class="headerCovTableEntry">511</td>
36+
<td class="headerCovTableEntryHi">93.7 %</td>
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
4949
<td></td>
5050
<td></td>
5151
<td class="headerItem">Branches:</td>
52-
<td class="headerCovTableEntry">122</td>
53-
<td class="headerCovTableEntry">124</td>
52+
<td class="headerCovTableEntry">126</td>
53+
<td class="headerCovTableEntry">128</td>
5454
<td class="headerCovTableEntryHi">98.4 %</td>
5555
</tr>
5656
<tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -144,38 +144,38 @@
144144
<tr>
145145
<td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
146146
<td class="coverBar" align="center">
147-
<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>
147+
<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>
148148
</td>
149-
<td class="coverPerHi">99.0&nbsp;%</td>
150-
<td class="coverNumHi">96 / 97</td>
149+
<td class="coverPerHi">99.1&nbsp;%</td>
150+
<td class="coverNumHi">105 / 106</td>
151151
<td class="coverPerHi">94.4&nbsp;%</td>
152152
<td class="coverNumHi">17 / 18</td>
153153
<td class="coverPerHi">100.0&nbsp;%</td>
154-
<td class="coverNumHi">29 / 29</td>
154+
<td class="coverNumHi">33 / 33</td>
155155
</tr>
156156
<tr>
157-
<td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
157+
<td class="coverFile"><a href="src/rules/validation/abstract/index.html">src/rules/validation/abstract</a></td>
158158
<td class="coverBar" align="center">
159159
<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>
160160
</td>
161161
<td class="coverPerHi">100.0&nbsp;%</td>
162162
<td class="coverNumHi">10 / 10</td>
163163
<td class="coverPerHi">100.0&nbsp;%</td>
164-
<td class="coverNumHi">1 / 1</td>
165-
<td class="coverPerHi">-</td>
166-
<td class="coverNumHi">0 / 0</td>
164+
<td class="coverNumHi">3 / 3</td>
165+
<td class="coverPerHi">100.0&nbsp;%</td>
166+
<td class="coverNumHi">4 / 4</td>
167167
</tr>
168168
<tr>
169-
<td class="coverFile"><a href="src/rules/validation/abstract/index.html">src/rules/validation/abstract</a></td>
169+
<td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
170170
<td class="coverBar" align="center">
171171
<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>
172172
</td>
173173
<td class="coverPerHi">100.0&nbsp;%</td>
174174
<td class="coverNumHi">10 / 10</td>
175175
<td class="coverPerHi">100.0&nbsp;%</td>
176-
<td class="coverNumHi">3 / 3</td>
177-
<td class="coverPerHi">100.0&nbsp;%</td>
178-
<td class="coverNumHi">4 / 4</td>
176+
<td class="coverNumHi">1 / 1</td>
177+
<td class="coverPerHi">-</td>
178+
<td class="coverNumHi">0 / 0</td>
179179
</tr>
180180
<tr>
181181
<td class="coverFile"><a href="src/modules/index.html">src/modules</a></td>

‎doc/coverage/coverage/index.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<td class="headerValue">lcov.info</td>
3232
<td></td>
3333
<td class="headerItem">Lines:</td>
34-
<td class="headerCovTableEntry">470</td>
35-
<td class="headerCovTableEntry">502</td>
36-
<td class="headerCovTableEntryHi">93.6 %</td>
34+
<td class="headerCovTableEntry">479</td>
35+
<td class="headerCovTableEntry">511</td>
36+
<td class="headerCovTableEntryHi">93.7 %</td>
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">117</td>
@@ -49,8 +49,8 @@
4949
<td></td>
5050
<td></td>
5151
<td class="headerItem">Branches:</td>
52-
<td class="headerCovTableEntry">122</td>
53-
<td class="headerCovTableEntry">124</td>
52+
<td class="headerCovTableEntry">126</td>
53+
<td class="headerCovTableEntry">128</td>
5454
<td class="headerCovTableEntryHi">98.4 %</td>
5555
</tr>
5656
<tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
@@ -120,14 +120,14 @@
120120
<tr>
121121
<td class="coverFile"><a href="src/rules/operation/index.html">src/rules/operation</a></td>
122122
<td class="coverBar" align="center">
123-
<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>
123+
<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>
124124
</td>
125-
<td class="coverPerHi">99.0&nbsp;%</td>
126-
<td class="coverNumHi">96 / 97</td>
125+
<td class="coverPerHi">99.1&nbsp;%</td>
126+
<td class="coverNumHi">105 / 106</td>
127127
<td class="coverPerHi">94.4&nbsp;%</td>
128128
<td class="coverNumHi">17 / 18</td>
129129
<td class="coverPerHi">100.0&nbsp;%</td>
130-
<td class="coverNumHi">29 / 29</td>
130+
<td class="coverNumHi">33 / 33</td>
131131
</tr>
132132
<tr>
133133
<td class="coverFile"><a href="src/rules/operation/abstract/index.html">src/rules/operation/abstract</a></td>
@@ -178,7 +178,7 @@
178178
<td class="coverNumHi">6 / 6</td>
179179
</tr>
180180
<tr>
181-
<td class="coverFile"><a href="test/RuleConditionalTransfer/index.html">test/RuleConditionalTransfer</a></td>
181+
<td class="coverFile"><a href="test/RuleConditionalTransfer/utils/index.html">test/RuleConditionalTransfer/utils</a></td>
182182
<td class="coverBar" align="center">
183183
<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>
184184
</td>

‎doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func-sort-c.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">0</td>

‎doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.func.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">0</td>

‎doc/coverage/coverage/script/CMTATWithRuleEngineScript.s.sol.gcov.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">0</td>

‎doc/coverage/coverage/script/RuleEngineScript.s.sol.func-sort-c.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">0</td>

‎doc/coverage/coverage/script/RuleEngineScript.s.sol.func.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</tr>
3838
<tr>
3939
<td class="headerItem">Date:</td>
40-
<td class="headerValue">2024-12-11 15:33:42</td>
40+
<td class="headerValue">2024-12-20 10:41:14</td>
4141
<td></td>
4242
<td class="headerItem">Functions:</td>
4343
<td class="headerCovTableEntry">0</td>

0 commit comments

Comments
 (0)