Skip to content

Commit

Permalink
[FAB-7636] remove dead refs to UNIT_TEST_PEER_IP
Browse files Browse the repository at this point in the history
UNIT_TEST_PEER_IP was referenced by code that was never called implying
the associated setup was unnecessary. This removes the environment
variable and supporting infrastructure.

Change-Id: I9fb8a7f5e3cf23ee2ab031c0b2dc50f8d49546ca
Signed-off-by: Matthew Sykes <[email protected]>
  • Loading branch information
sykesm committed Jan 6, 2018
1 parent b4a1ec8 commit a9a7b4b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
4 changes: 0 additions & 4 deletions core/comm/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,6 @@ func getEnv(key, def string) string {
}
}

func GetPeerTestingAddress(port string) string {
return getEnv("UNIT_TEST_PEER_IP", "localhost") + ":" + port
}

// NewClientConnectionWithAddress Returns a new grpc.ClientConn to the given address
func NewClientConnectionWithAddress(peerAddress string, block bool, tslEnabled bool,
creds credentials.TransportCredentials, ka *KeepaliveOptions) (*grpc.ClientConn, error) {
Expand Down
13 changes: 0 additions & 13 deletions unit-test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,11 @@
# SPDX-License-Identifier: Apache-2.0
#

vp:
image: hyperledger/fabric-peer
log_driver: none
expose:
- 7051
- 7052
environment:
- CORE_PEER_ADDRESSAUTODETECT=true
volumes:
- /var/run/docker.sock:/var/run/docker.sock

unit-tests:
image: hyperledger/fabric-testenv
links:
- vp
- couchdb
environment:
- UNIT_TEST_PEER_IP=vp
- GO_LDFLAGS
- GO_TAGS
- OUTPUT
Expand Down

0 comments on commit a9a7b4b

Please sign in to comment.