Skip to content

Commit

Permalink
Purge more stuff not necessary in FPC 1.0 (aka FPC Lite)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
bvavala authored and g2flyer committed Dec 8, 2020
1 parent 8de6f7a commit 651c4ed
Show file tree
Hide file tree
Showing 230 changed files with 11 additions and 37,394 deletions.
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ make.log
cscope.*
*~
**/_build/*
utils/docker-compose/bin/
utils/docker-compose/network-config/crypto-config/
utils/docker-compose/network-config/config/
utils/docker-compose/node-sdk/node_modules
utils/docker-compose/node-sdk/wallet
# generate protos
common/protos
internal/protos
internal/protos
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
TOP = .
include $(TOP)/build.mk

SUB_DIRS = protos common internal ercc ecc_enclave ecc tlcc_enclave tlcc fabric client_sdk examples utils integration # demo # docs
SUB_DIRS = protos common internal ercc ecc_enclave ecc fabric client_sdk examples utils integration # docs

FPC_SDK_DEP_DIRS = protos utils/fabric common ecc_enclave ecc
FPC_PEER_DEP_DIRS = protos common ercc tlcc_enclave tlcc fabric ecc_enclave ecc
# FPC_PEER_DEP_DIRS has to include ecc, ecc_enclave, common and ercc only if we run chaincode in external builder directly on host and not indirectly via docker
FPC_PEER_DEP_DIRS = protos common ercc fabric ecc_enclave ecc
# FPC_PEER_DEP_DIRS has to include protos, ecc, ecc_enclave, common and ercc only if we run chaincode in external builder directly on host and not indirectly via docker
FPC_PEER_CLI_WRAPPER_DEP_DIRS = utils/fabric


Expand Down
2 changes: 1 addition & 1 deletion config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export SGX_ARCH ?= x64
#--------------------------------------------------
# Give the option to override by custom protoc
# e.g. this is overloaded by travis and docker dev as we use protoc 3.11.4 to build
# protos in tlcc_enclave but use protoc 3.0.x to build SGX SDK and SSL
# protos in ecc_enclave but use protoc 3.0.x to build SGX SDK and SSL
export PROTOC_CMD ?= protoc

JAVA ?= java
Expand Down
6 changes: 0 additions & 6 deletions demo/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions demo/Makefile

This file was deleted.

273 changes: 0 additions & 273 deletions demo/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions demo/chaincode/Makefile

This file was deleted.

26 changes: 0 additions & 26 deletions demo/chaincode/fpc/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 651c4ed

Please sign in to comment.