Skip to content

Prepare for release and bring master up to dev#35

Merged
miketout merged 88 commits intomasterfrom
dev
Oct 29, 2018
Merged

Prepare for release and bring master up to dev#35
miketout merged 88 commits intomasterfrom
dev

Conversation

@miketout
Copy link
Copy Markdown
Owner

No description provided.

Asherda and others added 30 commits September 13, 2018 12:54
fixed path for komodo-cli
Merge dev branch for Sapling, nothing at stake, and many fixes/updates into VerusCoin
On Mac, force 64 bit as needed
Fix incorrect voutNum and ensure that voutNum is of output with value
Use the 64 bit reverser, the only one provided.
Sync Overwinter and Sapling defaults
Fix Komodo compatibility
zkbot and others added 29 commits October 23, 2018 22:52
…itcartel

Closes zcash#3467. Add benchmarks for Sapling spends and outputs.

Four new benchmarks are added to RPC zcbenchmark:
- createsaplingspend
- createsaplingoutput
- verifysaplingspend
- verifysaplingoutput
Fix error message

This error should never happen, but it may as well reference the method it is thrown from.
Adding missing batch scripts
Fix potentially misleading test failures

This is in response to zcash#3590 (comment)

Currently statements such as:

```assert_equal("Embarassment", "Embarrassment", "Misspelling detected")```

Will produce essentially the following error:
```
Assertion failed: Misspelling detected; expected: <Embarassment> but was: <Embarrassment>
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_framework/test_framework.py", line 121, in main
    self.run_test()
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_spelling.py", line 13, in run_test
```
Which is misleading because the item on the left is not what is actually expected.

This PR changes the assertion failure to be displayed as:
```
Assertion failed: (left == right); Misspelling detected
  left: <Embarassment>
 right: <Embarrassment>
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_framework/test_framework.py", line 121, in main
    self.run_test()
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_spelling.py", line 13, in run_test
```
The only upstream change relative to the previous commit is that the
various Zcash-specific dependencies have been pulled into a cargo
workspace. The dependecies in the workspace use the same commits as the
crates we had previously vendored.

The patches are necessary to handle the fact that cargo requires that
dev dependencies are available even if not used, and we would otherwise
need to vendor all the underlying crates.
This ensures that the depends system's custom PATH is applied correctly,
and the pre-build Rust binaries are accessible.
Pass parameter paths as native strings to librustzcash

Fixes a user-reported crash when starting on Windows with a Cyrillic non-UTF-8 locale.
Moving verus.bat from src to scr/fiat
Adjusting gitlab-ci configuration and Mac release packaging script to comform to the changes.
Updating package configuration from zcash
@miketout miketout merged commit 4a4c7b1 into master Oct 29, 2018
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.

7 participants