Skip to content

Commit

Permalink
consolidate protos/peer proto files
Browse files Browse the repository at this point in the history
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 <muralisr@us.ibm.com>
  • Loading branch information
Srinivasan Muralidharan committed Jan 18, 2017
1 parent 6da52bc commit 823aed3
Show file tree
Hide file tree
Showing 27 changed files with 1,071 additions and 1,457 deletions.
8 changes: 1 addition & 7 deletions core/peer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,11 @@ func CacheConfiguration() (err error) {
// getPeerEndpoint returns the PeerEndpoint for this Peer instance. Affected by env:peer.addressAutoDetect
getPeerEndpoint := func() (*pb.PeerEndpoint, error) {
var peerAddress string
var peerType pb.PeerEndpoint_Type
peerAddress, err := getLocalAddress()
if err != nil {
return nil, err
}
if viper.GetBool("peer.validator.enabled") {
peerType = pb.PeerEndpoint_VALIDATOR
} else {
peerType = pb.PeerEndpoint_NON_VALIDATOR
}
return &pb.PeerEndpoint{ID: &pb.PeerID{Name: viper.GetString("peer.id")}, Address: peerAddress, Type: peerType}, nil
return &pb.PeerEndpoint{ID: &pb.PeerID{Name: viper.GetString("peer.id")}, Address: peerAddress}, nil
}

localAddress, localAddressError = getLocalAddress()
Expand Down
161 changes: 113 additions & 48 deletions protos/peer/server_admin.pb.go → protos/peer/admin.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Loading

0 comments on commit 823aed3

Please sign in to comment.