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

Dex 257 price and fee deviations #2036

Merged
merged 11 commits into from Mar 19, 2019
Merged

Conversation

DenisSerebryansky
Copy link
Contributor

No description provided.

…er-fee-settings-in-rest-api

# Conflicts:
#	src/main/scala/com/wavesplatform/matcher/model/OrderValidator.scala
Merge remote-tracking branch 'remotes/origin/master' into DEX-257-price-and-fee-deviations

# Conflicts:
#	src/main/scala/com/wavesplatform/matcher/error/MatcherError.scala
#	src/main/scala/com/wavesplatform/matcher/model/OrderValidator.scala
#	src/main/scala/com/wavesplatform/settings/fee/OrderFeeSettings.scala
…ce-and-fee-deviations

# Conflicts:
#	src/main/scala/com/wavesplatform/matcher/model/OrderValidator.scala
#	src/main/scala/com/wavesplatform/settings/fee/OrderFeeSettings.scala
…ce-and-fee-deviations

# Conflicts:
#	src/test/scala/com/wavesplatform/matcher/MatcherTestData.scala
#	src/test/scala/com/wavesplatform/matcher/model/OrderValidatorSpecification.scala
@codecov-io
Copy link

Codecov Report

Merging #2036 into master will increase coverage by 0.09%.
The diff coverage is 64.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2036      +/-   ##
==========================================
+ Coverage   54.88%   54.97%   +0.09%     
==========================================
  Files         367      369       +2     
  Lines       12350    12384      +34     
  Branches      714      720       +6     
==========================================
+ Hits         6778     6808      +30     
- Misses       5572     5576       +4
Impacted Files Coverage Δ
...com/wavesplatform/matcher/error/MatcherError.scala 88.88% <ø> (ø) ⬆️
...m/wavesplatform/api/http/InvokeScriptRequest.scala 57.69% <ø> (ø) ⬆️
...rm/transaction/smart/InvokeScriptTransaction.scala 88.46% <ø> (ø) ⬆️
...form/state/diffs/InvokeScriptTransactionDiff.scala 86.66% <ø> (ø) ⬆️
...main/scala/com/wavesplatform/matcher/Matcher.scala 0% <0%> (ø) ⬆️
.../wavesplatform/settings/fee/OrderFeeSettings.scala 75% <100%> (-1.2%) ⬇️
.../scala/com/wavesplatform/mining/TxEstimators.scala 56.52% <100%> (ø) ⬆️
...om/wavesplatform/settings/DeviationsSettings.scala 100% <100%> (ø)
...orm/matcher/model/ExchangeTransactionCreator.scala 96.66% <100%> (ø) ⬆️
...la/com/wavesplatform/matcher/MatcherSettings.scala 96.87% <100%> (+0.1%) ⬆️
... and 10 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 94dfdf4...efbeeca. Read the comment docs.

Copy link
Contributor

@koloale koloale left a comment

Choose a reason for hiding this comment

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

Please check 2 comments

@koloale koloale merged commit 8b9fd4f into master Mar 19, 2019
@phearnot phearnot deleted the DEX-257-price-and-fee-deviations branch March 29, 2019 15:43
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.

None yet

3 participants