Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finalize v5.0: fix Zip and Append #771

Merged
merged 11 commits into from
Feb 17, 2022
Merged

Finalize v5.0: fix Zip and Append #771

merged 11 commits into from
Feb 17, 2022

Conversation

aslesarenko
Copy link
Member

@aslesarenko aslesarenko commented Dec 28, 2021

@codecov
Copy link

codecov bot commented Dec 28, 2021

Codecov Report

Merging #771 (19c04f7) into v5.0-todos (7baefef) will increase coverage by 0.04%.
The diff coverage is 95.65%.

Impacted file tree graph

@@              Coverage Diff               @@
##           v5.0-todos     #771      +/-   ##
==============================================
+ Coverage       71.68%   71.72%   +0.04%     
==============================================
  Files             248      248              
  Lines           18775    18790      +15     
  Branches          623      607      -16     
==============================================
+ Hits            13458    13478      +20     
+ Misses           5317     5312       -5     
Impacted Files Coverage Δ
...mon/src/main/scala/sigmastate/VersionContext.scala 68.75% <75.00%> (+4.46%) ⬆️
common/src/main/scala/sigmastate/util.scala 100.00% <100.00%> (ø)
...ain/scala/special/collection/CollsOverArrays.scala 87.03% <100.00%> (+0.68%) ⬆️
.../src/main/scala/sigmastate/DataValueComparer.scala 93.85% <0.00%> (-0.56%) ⬇️
.../main/scala/sigmastate/utils/SigmaByteReader.scala 92.06% <0.00%> (ø)
.../org/ergoplatform/validation/ValidationRules.scala 92.53% <0.00%> (ø)
sigmastate/src/main/scala/sigmastate/types.scala 92.93% <0.00%> (+0.09%) ⬆️
core/src/main/scala/scalan/DefRewriting.scala 74.11% <0.00%> (+1.17%) ⬆️
.../src/main/scala/special/collection/ViewColls.scala 90.10% <0.00%> (+2.19%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7baefef...19c04f7. Read the comment docs.

@aslesarenko aslesarenko mentioned this pull request Dec 28, 2021
21 tasks
@aslesarenko aslesarenko requested a review from kushti December 28, 2021 15:21
@aslesarenko aslesarenko mentioned this pull request Jan 24, 2022
6 tasks
# Conflicts:
#	library/src/test/scala/special/collections/CollsTests.scala
@aslesarenko aslesarenko requested a review from kushti February 14, 2022 13:45
Copy link
Member

@kushti kushti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please note:

  1. for interpreter, version, isActivatedVersionJit sounds ok , and even more precise than isActivatedVersionGreaterV1
  2. Please check the following commented out test in CollsTest
// TODO the following test fails because equality of Seq is not deep, and nested arrays are shallow compared
//    forAll(tokensGen, minSuccess) { c1 =>
//      println(s"c1=${c1.x.toArray.toSeq.map { case (id, v) => (id.toSeq, v) }}")
//      val tokens = c1.x
//      assert(tokens.toArray.toSeq == tokensArr.toSeq)
//    }

maybe it is not actual anymore, if actual, better to do GH issue, as commented out code , as well as TODO in the testing codebase can be forgotten for like forever

@aslesarenko
Copy link
Member Author

  • for interpreter, version, isActivatedVersionJit sounds ok , and even more precise than isActivatedVersionGreaterV1

  • Please check the following commented out test in CollsTest

  1. I would stick with isActivatedVersionGreaterV1 for consistency.
  2. This is obsolete check, removed.

@aslesarenko aslesarenko changed the base branch from v5.0-todos to v5.0-finalize February 17, 2022 20:08
@aslesarenko aslesarenko merged commit d179140 into v5.0-finalize Feb 17, 2022
@aslesarenko aslesarenko deleted the v5.0-fix-zip branch February 17, 2022 20:11
@kushti
Copy link
Member

kushti commented Feb 22, 2022

@aslesarenko named constants are used for improving readability, consistency is not needed there. For interpreter, isJitActivated says more than isActivatedVersionGreaterV1

@aslesarenko
Copy link
Member Author

Ok, will change in the next PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants