Skip to content

Commit 823aed3

Browse files
author
Srinivasan Muralidharan
committed
consolidate protos/peer proto files
https://jira.hyperledger.org/browse/FAB-1716 remove "fabric_" from filnames. consolidate files so we don't have so many. remove unused entries in "fabric.proto". remove message.proto remove properties from core.yaml not in use Change-Id: I0ee8d1bb87bf5cf3ebf9fb8b5e4c7aa30e8c7dcb Signed-off-by: Srinivasan Muralidharan <[email protected]>
1 parent 6da52bc commit 823aed3

27 files changed

+1071
-1457
lines changed

core/peer/config.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,11 @@ func CacheConfiguration() (err error) {
8585
// getPeerEndpoint returns the PeerEndpoint for this Peer instance. Affected by env:peer.addressAutoDetect
8686
getPeerEndpoint := func() (*pb.PeerEndpoint, error) {
8787
var peerAddress string
88-
var peerType pb.PeerEndpoint_Type
8988
peerAddress, err := getLocalAddress()
9089
if err != nil {
9190
return nil, err
9291
}
93-
if viper.GetBool("peer.validator.enabled") {
94-
peerType = pb.PeerEndpoint_VALIDATOR
95-
} else {
96-
peerType = pb.PeerEndpoint_NON_VALIDATOR
97-
}
98-
return &pb.PeerEndpoint{ID: &pb.PeerID{Name: viper.GetString("peer.id")}, Address: peerAddress, Type: peerType}, nil
92+
return &pb.PeerEndpoint{ID: &pb.PeerID{Name: viper.GetString("peer.id")}, Address: peerAddress}, nil
9993
}
10094

10195
localAddress, localAddressError = getLocalAddress()

protos/peer/server_admin.pb.go protos/peer/admin.pb.go

+113-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

0 commit comments

Comments
 (0)