Skip to content

Commit d626979

Browse files
FAB-3529 remove unused variables and functions
remove unused variables and functions found by unused Change-Id: I5e981ead1aad7451e6b26186e764cd8fb18c2cb9 Signed-off-by: Christopher Ferris <[email protected]>
1 parent 3a2a717 commit d626979

File tree

3 files changed

+1
-40
lines changed

3 files changed

+1
-40
lines changed

events/consumer/consumer.go

+1-32
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (ec *EventsClient) RegisterAsync(ies []*ehpb.Interest) error {
9393
emsg := &ehpb.Event{Event: &ehpb.Event_Register{Register: &ehpb.Register{Events: ies}}}
9494
var err error
9595
if err = ec.send(emsg); err != nil {
96-
fmt.Printf("error on Register send %s\n", err)
96+
consumerLogger.Errorf("error on Register send %s\n", err)
9797
}
9898
return err
9999
}
@@ -140,37 +140,6 @@ func (ec *EventsClient) UnregisterAsync(ies []*ehpb.Interest) error {
140140
return err
141141
}
142142

143-
// unregister - unregisters interest in a event
144-
func (ec *EventsClient) unregister(ies []*ehpb.Interest) error {
145-
var err error
146-
if err = ec.UnregisterAsync(ies); err != nil {
147-
return err
148-
}
149-
150-
regChan := make(chan struct{})
151-
go func() {
152-
defer close(regChan)
153-
in, inerr := ec.stream.Recv()
154-
if inerr != nil {
155-
err = inerr
156-
return
157-
}
158-
switch in.Event.(type) {
159-
case *ehpb.Event_Unregister:
160-
case nil:
161-
err = fmt.Errorf("invalid nil object for unregister")
162-
default:
163-
err = fmt.Errorf("invalid unregistration object")
164-
}
165-
}()
166-
select {
167-
case <-regChan:
168-
case <-time.After(ec.regTimeout):
169-
err = fmt.Errorf("timeout waiting for unregistration")
170-
}
171-
return err
172-
}
173-
174143
// Recv recieves next event - use when client has not called Start
175144
func (ec *EventsClient) Recv() (*ehpb.Event, error) {
176145
in, err := ec.stream.Recv()

events/events_test.go

-5
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ func createTestChaincodeEvent(tid string, typ string) *ehpb.Event {
149149
return emsg
150150
}
151151

152-
func closeListenerAndSleep(l net.Listener) {
153-
l.Close()
154-
time.Sleep(2 * time.Second)
155-
}
156-
157152
// Test the invocation of a transaction.
158153
func TestReceiveMessage(t *testing.T) {
159154
var err error

events/producer/producer.go

-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@ package producer
1919
import (
2020
"fmt"
2121
"io"
22-
"time"
2322

2423
"github.com/hyperledger/fabric/common/flogging"
2524
pb "github.com/hyperledger/fabric/protos/peer"
2625
)
2726

28-
const defaultTimeout = time.Second * 3
29-
3027
var logger = flogging.MustGetLogger("eventhub_producer")
3128

3229
// EventsServer implementation of the Peer service

0 commit comments

Comments
 (0)