Skip to content

Commit

Permalink
update tests with merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dwightguth committed Aug 22, 2024
1 parent fc64ebe commit 98840ef
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
15 changes: 15 additions & 0 deletions test/regression/arraystestcontract.ref
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<contract-fn-return-types>
ListItem ( uint256 [ ] )
</contract-fn-return-types>
<contract-fn-return-names>
ListItem ( noId )
</contract-fn-return-names>
<contract-fn-body>
return arr ; .Statements
</contract-fn-body>
Expand All @@ -56,6 +59,9 @@
<contract-fn-return-types>
.List
</contract-fn-return-types>
<contract-fn-return-names>
.List
</contract-fn-return-names>
<contract-fn-body>
.Statements
</contract-fn-body>
Expand All @@ -73,12 +79,21 @@
<tx-origin>
1p160
</tx-origin>
<this>
2p160
</this>
<this-type>
TestArraysContract
</this-type>
<env>
.Map
</env>
<store>
.Map
</store>
<call-stack>
.List
</call-stack>
<live-contracts>
<live-contract>
<contract-address>
Expand Down
18 changes: 18 additions & 0 deletions test/regression/mapstestcontract.ref
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<contract-fn-return-types>
.List
</contract-fn-return-types>
<contract-fn-return-names>
.List
</contract-fn-return-names>
<contract-fn-body>
.Statements
</contract-fn-body>
Expand All @@ -57,6 +60,9 @@
<contract-fn-return-types>
ListItem ( mapping ( address => uint256 ) )
</contract-fn-return-types>
<contract-fn-return-names>
ListItem ( noId )
</contract-fn-return-names>
<contract-fn-body>
return testMap ; .Statements
</contract-fn-body>
Expand All @@ -76,6 +82,9 @@
<contract-fn-return-types>
ListItem ( mapping ( address key => uint256 val ) )
</contract-fn-return-types>
<contract-fn-return-names>
ListItem ( noId )
</contract-fn-return-names>
<contract-fn-body>
return testMapWithOptIds ; .Statements
</contract-fn-body>
Expand All @@ -93,12 +102,21 @@
<tx-origin>
1p160
</tx-origin>
<this>
2p160
</this>
<this-type>
TestMapsContract
</this-type>
<env>
.Map
</env>
<store>
.Map
</store>
<call-stack>
.List
</call-stack>
<live-contracts>
<live-contract>
<contract-address>
Expand Down

0 comments on commit 98840ef

Please sign in to comment.