Skip to content

Problem: The Block class is deprecated#2368

Merged
z-bowen merged 3 commits intobigchaindb:masterfrom
codegeschrei:blocks-deprecated
Jun 29, 2018
Merged

Problem: The Block class is deprecated#2368
z-bowen merged 3 commits intobigchaindb:masterfrom
codegeschrei:blocks-deprecated

Conversation

@codegeschrei
Copy link
Copy Markdown
Contributor

Solution: remove the block class and all occurrences

import pytest

from bigchaindb.common.transaction import TransactionLink
from bigchaindb.models import Block, Transaction
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I deleted the file in the fastquery cleanup. Can you exclude it from here so that we avoid some git conflicts?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I can merge your PR. That's the only solution. I needed to remove it because otherwise my tests and linter were failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ah, did not get that, sorry. We can resolve the conflict then.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think it depends when we merge the PRs
If your PR is merged before mine, I can just merge master into mine. If mine is merged before it should actually not be a conflict (I think)

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2368 into master will increase coverage by 3.56%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2368      +/-   ##
==========================================
+ Coverage   83.07%   86.64%   +3.56%     
==========================================
  Files          38       38              
  Lines        2245     2126     -119     
==========================================
- Hits         1865     1842      -23     
+ Misses        380      284      -96

@z-bowen z-bowen merged commit af99665 into bigchaindb:master Jun 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.

4 participants