Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

[CBR-503] Refactor script-runner testcases; fix testHFM #4073

Merged
merged 1 commit into from
Feb 12, 2019

Conversation

mhuesch
Copy link
Contributor

@mhuesch mhuesch commented Feb 11, 2019

Description

I had repeated myself in testHardForkMechanism, by copying the
body of test4. Due to (what seems like) a botched rebase, my
CBR-503 PR was broken, and because of the duplication, I didn't
catch it in review. This commit factors out the shared logic, and
does checking (confSetBvAndSv) to make sure proposals are sane.

I also fix testHFM by making the BlockVersions and SoftwareVersions
agree.

Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-503

Type of change

  • 🐞 Bug fix (non-breaking change which fixes an issue)
  • [~] 🛠 New feature (non-breaking change which adds functionality)
  • [~] ⚠️ Breaking change (fix or feature that would cause existing functionality to change)
  • 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
  • 🔨 New or improved tests for existing code
  • [~] ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

  • I have read the style guide document, and my code follows the code style of this project.
  • If my code deals with exceptions, it follows the guidelines.
  • I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
  • CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.

QA Steps

See script-runner/README.md

How to merge

Send the message bors r+ to merge this PR. For more information, see docs/how-to/bors.md.

@mhuesch mhuesch force-pushed the mhuesch/fix_script-runner_testHFM branch 3 times, most recently from 8b5321c to 06b6c36 Compare February 11, 2019 22:30
I had repeated myself in `testHardForkMechanism`, by copying the
body of `test4`. Due to (what seems like) a botched rebase, my
CBR-503 PR was broken, and because of the duplication, I didn't
catch it in review. This commit factors out the shared logic, and
does checking (`confSetBvAndSv`) to make sure proposals are sane.

I also fix `testHFM` by making the BlockVersions and SoftwareVersions
agree.
@mhuesch mhuesch force-pushed the mhuesch/fix_script-runner_testHFM branch from 06b6c36 to 8ea5007 Compare February 11, 2019 22:30
Copy link
Contributor

@intricate intricate left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@intricate
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Feb 12, 2019
4073: [CBR-503] Refactor `script-runner` testcases; fix testHFM r=intricate a=mhuesch

## Description

I had repeated myself in `testHardForkMechanism`, by copying the
body of `test4`. Due to (what seems like) a botched rebase, my
CBR-503 PR was broken, and because of the duplication, I didn't
catch it in review. This commit factors out the shared logic, and
does checking (`confSetBvAndSv`) to make sure proposals are sane.

I also fix `testHFM` by making the BlockVersions and SoftwareVersions
agree.

## Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-503



Co-authored-by: Michael Hueschen <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 12, 2019

Build failed

@mhuesch
Copy link
Contributor Author

mhuesch commented Feb 12, 2019

bors r+

iohk-bors bot added a commit that referenced this pull request Feb 12, 2019
4073: [CBR-503] Refactor `script-runner` testcases; fix testHFM r=mhuesch a=mhuesch

## Description

I had repeated myself in `testHardForkMechanism`, by copying the
body of `test4`. Due to (what seems like) a botched rebase, my
CBR-503 PR was broken, and because of the duplication, I didn't
catch it in review. This commit factors out the shared logic, and
does checking (`confSetBvAndSv`) to make sure proposals are sane.

I also fix `testHFM` by making the BlockVersions and SoftwareVersions
agree.

## Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-503



Co-authored-by: Michael Hueschen <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 12, 2019

Build failed

@mhuesch
Copy link
Contributor Author

mhuesch commented Feb 12, 2019

bors r+

iohk-bors bot added a commit that referenced this pull request Feb 12, 2019
4073: [CBR-503] Refactor `script-runner` testcases; fix testHFM r=mhuesch a=mhuesch

## Description

I had repeated myself in `testHardForkMechanism`, by copying the
body of `test4`. Due to (what seems like) a botched rebase, my
CBR-503 PR was broken, and because of the duplication, I didn't
catch it in review. This commit factors out the shared logic, and
does checking (`confSetBvAndSv`) to make sure proposals are sane.

I also fix `testHFM` by making the BlockVersions and SoftwareVersions
agree.

## Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-503



Co-authored-by: Michael Hueschen <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 12, 2019

@iohk-bors iohk-bors bot merged commit 8ea5007 into develop Feb 12, 2019
@iohk-bors iohk-bors bot deleted the mhuesch/fix_script-runner_testHFM branch February 12, 2019 18:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants