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

Merge bcp demo into weave #91

Merged
merged 107 commits into from
Aug 28, 2018
Merged

Merge bcp demo into weave #91

merged 107 commits into from
Aug 28, 2018

Conversation

ethanfrey
Copy link
Contributor

@ethanfrey ethanfrey commented Aug 24, 2018

One repo for all the code. This gets rid of lots of headaches

  • Merge bcp-demo code into x/* for reusable extensions and examples/bov for app code
  • Update all imports and Makefiles
  • Compiles properly
  • Tests pass
  • Fix Dockerfile scripts as needed
  • Update .travis.yaml (merge examples/bov with root)
  • Update links in docs

Once this is basically working, we can start improving the code quality and reuse in other PRs

CI updates are done separately in #93

@ethanfrey ethanfrey requested a review from alpe as a code owner August 24, 2018 16:54
@codecov-io
Copy link

codecov-io commented Aug 24, 2018

Codecov Report

Merging #91 into master will decrease coverage by 0.9%.
The diff coverage is 72.4%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #91    +/-   ##
=======================================
- Coverage    77.5%   76.5%    -1%     
=======================================
  Files          62      80    +18     
  Lines        2531    3399   +868     
=======================================
+ Hits         1962    2601   +639     
- Misses        462     627   +165     
- Partials      107     171    +64
Impacted Files Coverage Δ
examples/bov/app/examples.go 0% <0%> (ø)
x/hashlock/tx.go 100% <100%> (ø)
x/hashlock/decorator.go 100% <100%> (ø)
x/hashlock/context.go 100% <100%> (ø)
x/namecoin/controller.go 100% <100%> (ø)
examples/bov/app/tx.go 46.8% <46.8%> (ø)
x/escrow/model.go 65.4% <65.4%> (ø)
x/escrow/handler.go 68% <68%> (ø)
x/namecoin/init.go 75.8% <75.8%> (ø)
x/escrow/errors.go 78.2% <78.2%> (ø)
... and 27 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 4a2f9a4...0aa533c. Read the comment docs.

@@ -0,0 +1,91 @@
# bov
Copy link
Contributor

Choose a reason for hiding this comment

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

We can rename to bcpd here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great. I was wondering about naming...
This will break some of the Docker scripts as well, so maybe they can fix that up once we have a new name.

@@ -0,0 +1,91 @@
# bov

Blockchain of value reference implementation
Copy link
Contributor

Choose a reason for hiding this comment

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

Blockchain Communications Protocol Daemon...

Copy link
Contributor

@Isabello Isabello left a comment

Choose a reason for hiding this comment

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

maybe do bov >>> bcpd rename in a second PR. the rest looks good text wise.

@codecov-io
Copy link

codecov-io commented Aug 27, 2018

Codecov Report

Merging #91 into master will decrease coverage by 0.9%.
The diff coverage is 72.4%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #91    +/-   ##
=======================================
- Coverage    77.5%   76.5%    -1%     
=======================================
  Files          62      80    +18     
  Lines        2531    3399   +868     
=======================================
+ Hits         1962    2601   +639     
- Misses        462     627   +165     
- Partials      107     171    +64
Impacted Files Coverage Δ
cmd/bcpd/app/examples.go 0% <0%> (ø)
x/namecoin/controller.go 100% <100%> (ø)
x/hashlock/tx.go 100% <100%> (ø)
x/hashlock/decorator.go 100% <100%> (ø)
x/hashlock/context.go 100% <100%> (ø)
cmd/bcpd/app/tx.go 46.8% <46.8%> (ø)
x/escrow/model.go 65.4% <65.4%> (ø)
x/escrow/handler.go 68% <68%> (ø)
x/namecoin/init.go 75.8% <75.8%> (ø)
x/escrow/errors.go 78.2% <78.2%> (ø)
... and 27 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 4a2f9a4...9e918d3. Read the comment docs.

Copy link
Contributor

@alpe alpe left a comment

Choose a reason for hiding this comment

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

  • Code merge looks very good! 🌷
  • Travis build needs some updates to work proper but let's do this in a new PR
  • there are still some references to bcp-demo in the .rts files that can be done in a new PR
    🚀

@@ -1,7 +1,19 @@
# Binaries for programs and plugins
Copy link
Contributor

Choose a reason for hiding this comment

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

fyi: You can have a global .gitignore: https://github.com/alpe/dotfiles/blob/master/.gitignore

@@ -0,0 +1,51 @@
sudo: required
Copy link
Contributor

Choose a reason for hiding this comment

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

The .travis.yml file needs to go into the project root folder. But let me fix this in a new PR afterwards. There are also travis-ci settings for docker hub to be configured in order to push the artifact.

@@ -0,0 +1,8 @@
/*
Package commands has integration tests of the mycoind
Copy link
Contributor

Choose a reason for hiding this comment

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

q: should mycoind be replaced with bcpd?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup


// we must have covered it above
panic(sum)
// return nil, errors.ErrUnknownTxType(nil) // alpe????
Copy link
Contributor

Choose a reason for hiding this comment

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

pp: ja, don't panic but return ErrUnknownTxType :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You got the message. Will do

@ethanfrey ethanfrey merged commit ca3bcd0 into master Aug 28, 2018
@ethanfrey ethanfrey deleted the merge-bcp-demo branch September 6, 2018 13:31
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.

5 participants