Skip to content

Commit

Permalink
Remove cli from fabric-ca
Browse files Browse the repository at this point in the history
This change set removes the cli directory from fabric-ca.
The cli directory contained all of the code for the old
fabric-ca executable, but now that fabric-ca-server and
fabric-ca-client executables are functional, it is time
to delete the old code.

This also required updating some test code also which was
still using the code under cli.

https://jira.hyperledger.org/browse/FAB-2012

Change-Id: I4b8dc16e2be39b9c27a52bb167e285e0b88adcf5
Signed-off-by: Keith Smith <[email protected]>
  • Loading branch information
Keith Smith committed Mar 9, 2017
1 parent 403080d commit ee4f92a
Show file tree
Hide file tree
Showing 23 changed files with 74 additions and 2,757 deletions.
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#
# - all (default) - builds all targets and runs all tests
# - license - check all go files for license headers
# - fabric-ca - builds the fabric-ca executable
# - fabric-ca-server - builds the fabric-ca-server executable
# - fabric-ca-client - builds the fabric-ca-client executable
# - unit-tests - Performs checks first and runs the go-test based unit tests
Expand Down Expand Up @@ -53,10 +52,8 @@ BASEIMAGE_RELEASE = 0.3.0
PKGNAME = github.com/hyperledger/$(PROJECT_NAME)

DOCKER_ORG = hyperledger
# IMAGES = $(PROJECT_NAME) $(PROJECT_NAME)-fvt
IMAGES = $(PROJECT_NAME)

path-map.fabric-ca := ./
path-map.fabric-ca-client := ./cmd/fabric-ca-client
path-map.fabric-ca-server := ./cmd/fabric-ca-server

Expand Down Expand Up @@ -86,7 +83,6 @@ lint: .FORCE
vet: .FORCE
@scripts/check_vet

fabric-ca: bin/fabric-ca
fabric-ca-client: bin/fabric-ca-client
fabric-ca-server: bin/fabric-ca-server

Expand Down Expand Up @@ -129,10 +125,7 @@ build/image/%/$(DUMMY): Makefile build/image/%/payload
build/image/fabric-ca/payload: \
build/docker/bin/fabric-ca-client \
build/docker/bin/fabric-ca-server \
build/fabric-ca.tar.bz2
build/image/fabric-ca-fvt/payload: \
build/docker/bin/fabric-ca
images/fabric-ca-fvt/start.sh
build/fabric-ca.tar.bz2
build/image/%/payload:
@echo "Copying $^ to $@"
mkdir -p $@
Expand All @@ -143,17 +136,14 @@ build/%.tar.bz2:
@echo "Building $@"
@tar -jc -C images/$*/payload $(notdir $^) > $@

unit-tests: checks fabric-ca fabric-ca-server fabric-ca-client
unit-tests: checks fabric-ca-server fabric-ca-client
@scripts/run_tests

container-tests: ldap-tests

ldap-tests:
@scripts/run_ldap_tests

fvt-tests: fabric-ca
@scripts/run_fvt_tests

%-docker-clean:
$(eval TARGET = ${patsubst %-docker-clean,%,${@}})
-docker images -q $(DOCKER_ORG)/$(TARGET):latest | xargs -I '{}' docker rmi -f '{}'
Expand Down
42 changes: 0 additions & 42 deletions cli/client/client.go

This file was deleted.

250 changes: 0 additions & 250 deletions cli/client/client_test.go

This file was deleted.

Loading

0 comments on commit ee4f92a

Please sign in to comment.