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

Refactor FFCAPI to a local API interace, and FFTM to a utility package #7

Merged
merged 106 commits into from
Aug 10, 2022

Conversation

peterbroadhurst
Copy link
Contributor

@peterbroadhurst peterbroadhurst commented Jun 2, 2022

This is quite a big change.

  • Removes the Docker build from this package - this means the existing builds will stay for those using them
  • Reinstates the FFCAPI definition here, which was recently moved to FF common, and now removed in Remove FFCAPI for updated architecture firefly-common#15
  • Refactors the FFCAPI to be a local interface, rather than remote
    • This is because it's just too complex to having the potential of state mismatch in event state between the FFCAPI and the FFTM, and build a clean interface
  • Removes the fftm and cmd directories
  • Moves the internal/manager to be pkg/fftm for use by FFCAPI connectors
    • They will inject their implementation into the fftm.Manager to start their server

@peterbroadhurst peterbroadhurst marked this pull request as ready for review June 2, 2022 03:02
@peterbroadhurst peterbroadhurst requested a review from nguyer as a code owner June 2, 2022 03:02
@peterbroadhurst peterbroadhurst marked this pull request as draft June 3, 2022 20:08
@peterbroadhurst
Copy link
Contributor Author

Moving to draft until we have confirmed correct operation with the latest alpha code and the old FFTM codestream

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
@codecov-commenter
Copy link

codecov-commenter commented Jun 10, 2022

Codecov Report

Merging #7 (b9bae85) into main (9ab5b7a) will decrease coverage by 0.10%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##              main       #7      +/-   ##
===========================================
- Coverage   100.00%   99.89%   -0.11%     
===========================================
  Files           15       47      +32     
  Lines         1045     2820    +1775     
===========================================
+ Hits          1045     2817    +1772     
- Misses           0        2       +2     
- Partials         0        1       +1     
Impacted Files Coverage Δ
pkg/policyengines/simple/simple_policy_engine.go 97.47% <ø> (ø)
internal/blocklistener/blocklistener.go 100.00% <100.00%> (ø)
internal/confirmations/confirmations.go 100.00% <100.00%> (ø)
internal/events/eventstream.go 100.00% <100.00%> (ø)
internal/events/listener.go 100.00% <100.00%> (ø)
internal/events/webhooks.go 100.00% <100.00%> (ø)
internal/events/websockets.go 100.00% <100.00%> (ø)
internal/persistence/leveldb_persistence.go 100.00% <100.00%> (ø)
internal/tmconfig/tmconfig.go 100.00% <100.00%> (ø)
internal/ws/wsconn.go 100.00% <100.00%> (ø)
... and 38 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
@peterbroadhurst peterbroadhurst marked this pull request as ready for review August 3, 2022 22:05
peterbroadhurst and others added 24 commits August 4, 2022 09:11
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
…action hash

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Add backwards compatibility for listener methods
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Copy link
Contributor

@nguyer nguyer left a comment

Choose a reason for hiding this comment

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

Having been keeping up with changes as they are merged or committed to this branch, and having done extensive testing on it, I think this is stable enough for a merge to main now.

@nguyer nguyer merged commit 871d2ae into hyperledger:main Aug 10, 2022
@nguyer nguyer deleted the events branch August 10, 2022 12:38
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.

3 participants