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

Purge more stuff not necessary in FPC 1.0 (aka FPC Lite) #481

Merged

Conversation

g2flyer
Copy link
Contributor

@g2flyer g2flyer commented Dec 7, 2020

What this PR does / why we need it:

One step more along the agreement of last week to purge FPC "Full" stuff.
More specifically, it does remove tlcc* and validation plugins, some related fabric makefile stuff. It also removes demo and utils/docker-compose (with the included but anyway outdated node-sdk code)

Other potential clean-up actions which probably require further discussions:

  • docu (see issue Update documentation to match FPC Lite #487 for separate issue on that)
  • stuff in ecc*. This needs coordination with ecc-ecc_mock merge; also seems to contain other obsolete code around "setup" and code in ecc/crypto/ obsoleted by new code in internal ...
  • remove of auction example (not really supported, but our "main" test program in integration test,
    so we would have to replace it with something else, we cannot just remove it). There is now a separate issue FPC-1.0 conformant replacement for auction example/integration test #491 for that ....
  • a number of what is in common, e.g., common/enclave, is really more and more ecc specific and might better move there eventually. But certainly no priority and probably best done at a point we have to do anyway some refactoring with that code ...

note: look at pre-fpc-lite & ccr2.0.0 if you want pre-fpc-lite/fpc 1.0 code with original trusted-ledger and validation code ...)

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing changes and/or breaks backward compatability?:

@g2flyer g2flyer requested review from mbrandenburger, bvavala and a team December 7, 2020 21:44
Copy link
Contributor

@bvavala bvavala left a comment

Choose a reason for hiding this comment

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

Nice!

@g2flyer g2flyer marked this pull request as draft December 8, 2020 00:15
@g2flyer
Copy link
Contributor Author

g2flyer commented Dec 8, 2020

travis failed, not yet 100% sure why (i actually had tested locally a make clobber all ...) but i noticed there is still tons of other tlcc stuff in ecc* to be rooted out. So moved to DRAFT mode for now ...

@g2flyer g2flyer force-pushed the msteiner.more-tlcc-vlscc-purges branch from 1cdec76 to 537f812 Compare December 8, 2020 01:24
@g2flyer g2flyer marked this pull request as ready for review December 8, 2020 01:49
@g2flyer g2flyer force-pushed the msteiner.more-tlcc-vlscc-purges branch from 537f812 to f8b3029 Compare December 8, 2020 17:45
@g2flyer g2flyer assigned bvavala and unassigned mbrandenburger Dec 8, 2020
@@ -22,11 +22,6 @@ extern sgx_ec256_public_t enclave_pk;
// this is tlcc binding
sgx_ec256_public_t tlcc_pk = {0};

// TODO: replace with secure key generated in `common/enclave/cc_data.cpp` when we also create
// cc-encryption/decryption key-pair .. state encryption key; hardcoded for debugging
sgx_aes_gcm_128bit_key_t state_encryption_key = {
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess you squashed a bit too much. Luckily it does not conflict!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Arghh, good catch. turns out i screwed up in rebase and merged my changes into your commit (and also forgot to add some changes i had locally).
=> don't merge yet but wait for force-push below (and corresponding successful travis build)

@g2flyer g2flyer force-pushed the msteiner.more-tlcc-vlscc-purges branch from f8b3029 to e6d6a78 Compare December 8, 2020 19:51
* tlcc* and validation plugins, some related fabric
  makefile stuff
* demo, as not fpc-lite conformant
* utils/docker-compose as not used without demo and anyway
  eventually made obsolete by test-network stuff once that's
  polished. This also removes the node-sdk code which was there
  somewhat out-of-place and also outdated and not really supported
  for now in FPC lite

(note: look at `pre-fpc-lite` & `ccr2.0.0` if you want
 pre-fpc-lite/fpc 1.0 code with original trusted-ledger
 and validation code ...)

Signed-off-by: Michael Steiner <[email protected]>
@g2flyer g2flyer force-pushed the msteiner.more-tlcc-vlscc-purges branch from e6d6a78 to 651c4ed Compare December 8, 2020 19:54
@bvavala bvavala merged commit 5e9c726 into hyperledger:master Dec 8, 2020
@g2flyer g2flyer deleted the msteiner.more-tlcc-vlscc-purges branch February 3, 2021 19:46
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