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 master #1416

Merged
merged 228 commits into from
Jul 24, 2020
Merged

Merge master #1416

merged 228 commits into from
Jul 24, 2020

Conversation

mikiquantum
Copy link
Contributor

No description provided.

charleenfei and others added 30 commits April 1, 2019 14:46
return correct error on GetDocument
Fixes the issue from GoreportCard
* Adding attributes to models

* Partially test

* LGTM

* Review comments
* WIP: Upgrade libp2p

* WIP: Upgrade libp2p

* dep
* protobuf for entity relations

* better comments

* better naming

* fmt

* new entity handler response

* fmt

* fmt

* fixed entityrelationship model

* formatting

* swagger update
Closes #909 

Changes:
- Removed the certificates
- GRPC server will be run on a different port and `127.0.0.1`
- API host is `127.0.0.1` by default but can be changed through `createconfig`
* Allow setting Ethereum max gas price

* Fix lint

* Review comment and minor
* new files

* wip

* added protos

* model

* spacing

* tests

* fix

* fix

* fix

* initial commit

* rm label

* initial

* fix

* wip

* fix

* wip

* wip

* wip

* wip

* fix

* swagger

* test

* spacing
* entity GET method

* moved isCollaborator to coredocument
* dont return error for gas price breach

* Different gas limits for different ops

* Different gas limits for different ops

* Fix tests

* test fix

* cache the keys instead of the opts

* use context.backGround for now

* Revert txopts cache and review comments

* ignore .DS_Store
* dont return error for gas price breach

* Different gas limits for different ops

* Different gas limits for different ops

* Fix tests

* test fix

* cache the keys instead of the opts

* use context.backGround for now

* Revert txopts cache and review comments

* ignore .DS_Store

* Remove the unuseful config api

* stuff
* new files

* wip

* added protos

* model

* spacing

* tests

* fix

* fix

* fix

* initial commit

* rm label

* initial

* fix

* wip

* fix

* wip

* wip

* wip

* wip

* fix

* swagger

* test

* spacing

* initial

* added ER repository and bootstrapper

* fmt

* wrapped document.repository

* fix

* spacing

* rm Gopkg.lock

* added request method for document

* fmt
* Fix block no ready in light node

* Fix block no ready in light node

* test
* P2P error masking

* Adjustments

* Adjustments

* Adjustments

* Review comments

* Review comments

* merge
* ethereum key from env

* New bootstrap peers
* bindings

* Add nft index to api response

* data

* Latest smart contracts and fixes

* Latest smart contracts and fixes

* Fix tests 1

* Fix testworld

* Review comments

* contracts

* merge

* version change
* Remove pb errors

* Add ascii art and messafge

* Fix build

* Disclaimer

* More build fixes
* initial implementation getDocumentRequest

* fixed unit tests

* added todo comments

* added test for p2p

* added granter to entityrelationship

* fixed p2p testworld test

* fixed p2p testworld test with er send/receive

* fmt

* processor bootstrapper no nil check

* fixed p2p testworld test

* fmt

* fmt and selfDID from ctx

* fixed self.DID parameter

* fmt

* fmt

* fmt
* ethereum key from env

* hex string index

* string trim
vedhavyas and others added 25 commits April 24, 2020 07:40
* deploy asset handler

* update repo url
* Use temp fix for indices

* fix gopck

* use released cent image
* phase 1

* working version of bridge v2

* remove fmt

* lint

* GSRPC dep

* testing

* testing

* testing

* testing

* comment test

* re-enable parallel tw test

* new chain
* Use temp fix for indices

* Adding latest bridge pre-release

* remove echo

* Fix nix pull

* fixes

* latest bridge + contracts

* Latest Chain version
* Use temp fix for indices

* Use 1.13 for xgo
* Use temp fix for indices

* Fix Dockerfile to use Go 1.14
* Use temp fix for indices

* Updated to latest v1 bridge components
@codecov
Copy link

codecov bot commented Jul 22, 2020

Codecov Report

Merging #1416 into master will decrease coverage by 1.43%.
The diff coverage is 69.41%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1416      +/-   ##
==========================================
- Coverage   69.77%   68.34%   -1.44%     
==========================================
  Files         158      162       +4     
  Lines       11211    11667     +456     
==========================================
+ Hits         7823     7974     +151     
- Misses       2610     2938     +328     
+ Partials      778      755      -23     
Impacted Files Coverage Δ
anchors/bootstrapper.go 0.00% <0.00%> (-50.00%) ⬇️
anchors/service.go 16.00% <0.00%> (-40.48%) ⬇️
bootstrap/bootstrappers/bootstrapper.go 4.25% <0.00%> (-0.10%) ⬇️
centchain/bootstrapper.go 0.00% <0.00%> (ø)
centchain/test_bootstrapper.go 0.00% <0.00%> (ø)
config/bootstrapper.go 0.00% <0.00%> (ø)
config/configstore/mock_service.go 0.00% <0.00%> (ø)
contextutil/context.go 17.02% <0.00%> (+0.69%) ⬆️
crypto/keytools.go 0.00% <ø> (ø)
documents/entity/bootstrapper.go 8.69% <0.00%> (ø)
... and 130 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 5633745...83e375a. Read the comment docs.

@mikiquantum mikiquantum merged commit 982af16 into master Jul 24, 2020
@mikiquantum mikiquantum deleted the merge_master branch July 24, 2020 23:40
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

10 participants