Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 81694dd

Browse files
author
Baha Shaaban
committed
[FAB-10511] clean up sdk log calls
Change-Id: Id5a5c3689437a59b3ca026b3403943aab057d991 Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>
1 parent 38d3ff8 commit 81694dd

File tree

163 files changed

+1127
-1125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+1127
-1125
lines changed

‎pkg/client/channel/chclient_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestTxProposalResponseFilter(t *testing.T) {
4848

4949
_, err := chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
5050
if err == nil {
51-
t.Fatalf("Should have failed for not success status")
51+
t.Fatal("Should have failed for not success status")
5252
}
5353
statusError, ok := status.FromError(err)
5454
assert.True(t, ok, "Expected status error")
@@ -62,7 +62,7 @@ func TestTxProposalResponseFilter(t *testing.T) {
6262
chClient = setupChannelClient(peers, t)
6363
_, err = chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
6464
if err == nil {
65-
t.Fatalf("Should have failed for not success status")
65+
t.Fatal("Should have failed for not success status")
6666
}
6767
statusError, ok = status.FromError(err)
6868
assert.True(t, ok, "Expected status error")
@@ -77,17 +77,17 @@ func TestQuery(t *testing.T) {
7777

7878
_, err := chClient.Query(Request{})
7979
if err == nil {
80-
t.Fatalf("Should have failed for empty query request")
80+
t.Fatal("Should have failed for empty query request")
8181
}
8282

8383
_, err = chClient.Query(Request{Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
8484
if err == nil {
85-
t.Fatalf("Should have failed for empty chaincode ID")
85+
t.Fatal("Should have failed for empty chaincode ID")
8686
}
8787

8888
_, err = chClient.Query(Request{ChaincodeID: "testCC", Args: [][]byte{[]byte("query"), []byte("b")}})
8989
if err == nil {
90-
t.Fatalf("Should have failed for empty function")
90+
t.Fatal("Should have failed for empty function")
9191
}
9292

9393
response, err := chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
@@ -107,7 +107,7 @@ func TestQuery(t *testing.T) {
107107
chClient = setupChannelClient([]fab.Peer{testPeer1, testPeer2}, t)
108108
_, err = chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
109109
if err == nil {
110-
t.Fatalf("Should have failed")
110+
t.Fatal("Should have failed")
111111
}
112112
s, ok := status.FromError(err)
113113
assert.True(t, ok, "expected status error")
@@ -120,7 +120,7 @@ func TestQuerySelectionError(t *testing.T) {
120120

121121
_, err := chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
122122
if err == nil {
123-
t.Fatalf("Should have failed to query with error in selection.GetEndorsersFor ...")
123+
t.Fatal("Should have failed to query with error in selection.GetEndorsersFor ...")
124124
}
125125
}
126126

@@ -182,14 +182,14 @@ func TestQueryWithNilTargets(t *testing.T) {
182182
_, err := chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke",
183183
Args: [][]byte{[]byte("query"), []byte("b")}}, WithTargets(nil, nil))
184184
if err == nil || !strings.Contains(err.Error(), "target is nil") {
185-
t.Fatalf("Should have failed to invoke test cc due to nil target")
185+
t.Fatal("Should have failed to invoke test cc due to nil target")
186186
}
187187

188188
peers := []fab.Peer{fcmocks.NewMockPeer("Peer1", "http://peer1.com"), nil}
189189
_, err = chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke",
190190
Args: [][]byte{[]byte("query"), []byte("b")}}, WithTargets(peers...))
191191
if err == nil || !strings.Contains(err.Error(), "target is nil") {
192-
t.Fatalf("Should have failed to invoke test cc due to nil target")
192+
t.Fatal("Should have failed to invoke test cc due to nil target")
193193
}
194194
}
195195

@@ -198,17 +198,17 @@ func TestExecuteTx(t *testing.T) {
198198

199199
_, err := chClient.Execute(Request{})
200200
if err == nil {
201-
t.Fatalf("Should have failed for empty invoke request")
201+
t.Fatal("Should have failed for empty invoke request")
202202
}
203203

204204
_, err = chClient.Execute(Request{Fcn: "invoke", Args: [][]byte{[]byte("move"), []byte("a"), []byte("b"), []byte("1")}})
205205
if err == nil {
206-
t.Fatalf("Should have failed for empty chaincode ID")
206+
t.Fatal("Should have failed for empty chaincode ID")
207207
}
208208

209209
_, err = chClient.Execute(Request{ChaincodeID: "testCC", Args: [][]byte{[]byte("move"), []byte("a"), []byte("b"), []byte("1")}})
210210
if err == nil {
211-
t.Fatalf("Should have failed for empty function")
211+
t.Fatal("Should have failed for empty function")
212212
}
213213

214214
// Test return different payload
@@ -219,7 +219,7 @@ func TestExecuteTx(t *testing.T) {
219219
chClient = setupChannelClient([]fab.Peer{testPeer1, testPeer2}, t)
220220
_, err = chClient.Execute(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("move"), []byte("b")}})
221221
if err == nil {
222-
t.Fatalf("Should have failed")
222+
t.Fatal("Should have failed")
223223
}
224224
s, ok := status.FromError(err)
225225
assert.True(t, ok, "expected status error")
@@ -316,7 +316,7 @@ func TestExecuteTxSelectionError(t *testing.T) {
316316
_, err := chClient.Execute(Request{ChaincodeID: "testCC", Fcn: "invoke",
317317
Args: [][]byte{[]byte("move"), []byte("a"), []byte("b"), []byte("1")}})
318318
if err == nil {
319-
t.Fatalf("Should have failed to execute tx with error in selection.GetEndorserrsFor ...")
319+
t.Fatal("Should have failed to execute tx with error in selection.GetEndorserrsFor ...")
320320
}
321321
}
322322

@@ -333,7 +333,7 @@ func TestRPCStatusErrorPropagation(t *testing.T) {
333333

334334
_, err := chClient.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
335335
if err == nil {
336-
t.Fatalf("Should have failed for not success status")
336+
t.Fatal("Should have failed for not success status")
337337
}
338338
statusError, ok := status.FromError(err)
339339
assert.True(t, ok, "Expected status error")

‎pkg/client/channel/example_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func Example() {
2222

2323
response, err := c.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("data")}})
2424
if err != nil {
25-
fmt.Printf("failed to query chaincode: %v", err)
25+
fmt.Printf("failed to query chaincode: %s", err)
2626
}
2727

2828
fmt.Println(string(response.Payload))
@@ -58,7 +58,7 @@ func ExampleClient_Query() {
5858

5959
response, err := c.Query(Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}})
6060
if err != nil {
61-
fmt.Printf("failed to query chaincode: %v", err)
61+
fmt.Printf("failed to query chaincode: %s", err)
6262
}
6363

6464
if len(response.Payload) > 0 {
@@ -113,7 +113,7 @@ func ExampleClient_InvokeHandler() {
113113

114114
response, err := c.InvokeHandler(&exampleHandler{}, Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("data")}})
115115
if err != nil {
116-
fmt.Printf("failed to query chaincode: %v", err)
116+
fmt.Printf("failed to query chaincode: %s", err)
117117
}
118118

119119
fmt.Println(string(response.Payload))

‎pkg/client/channel/invoke/txnhandler_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func TestProposalProcessorHandlerPassDirectly(t *testing.T) {
232232
t.Fatalf("Expecting 1 proposal processor but got %d", len(requestContext.Opts.Targets))
233233
}
234234
if requestContext.Opts.Targets[0] != peer2 {
235-
t.Fatalf("Didn't get expected peers")
235+
t.Fatal("Didn't get expected peers")
236236
}
237237
}
238238

@@ -252,7 +252,7 @@ func TestProposalProcessorHandler(t *testing.T) {
252252
t.Fatalf("Expecting %d proposal processors but got %d", len(discoveryPeers), len(requestContext.Opts.Targets))
253253
}
254254
if requestContext.Opts.Targets[0] != peer1 || requestContext.Opts.Targets[1] != peer2 {
255-
t.Fatalf("Didn't get expected peers")
255+
t.Fatal("Didn't get expected peers")
256256
}
257257

258258
requestContext = prepareRequestContext(request, Opts{TargetFilter: &filter{peer: peer2}}, t)
@@ -264,7 +264,7 @@ func TestProposalProcessorHandler(t *testing.T) {
264264
t.Fatalf("Expecting 1 proposal processor but got %d", len(requestContext.Opts.Targets))
265265
}
266266
if requestContext.Opts.Targets[0] != peer2 {
267-
t.Fatalf("Didn't get expected peers")
267+
t.Fatal("Didn't get expected peers")
268268
}
269269
}
270270

‎pkg/client/common/discovery/discoveryfilter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestDiscoveryFilter(t *testing.T) {
6060
}
6161

6262
if !discoveryFilter.called {
63-
t.Fatalf("Expecting true, got false")
63+
t.Fatal("Expecting true, got false")
6464
}
6565

6666
}

‎pkg/client/common/discovery/dynamicdiscovery/chservice.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type ChannelService struct {
2626

2727
// NewChannelService creates a Discovery Service to query the list of member peers on a given channel.
2828
func NewChannelService(ctx contextAPI.Client, channelID string, opts ...coptions.Opt) (*ChannelService, error) {
29-
logger.Debugf("Creating new dynamic discovery service")
29+
logger.Debug("Creating new dynamic discovery service")
3030
s := &ChannelService{
3131
channelID: channelID,
3232
}
@@ -99,7 +99,7 @@ func (s *ChannelService) evaluate(ctx contextAPI.Client, responses []fabdiscover
9999
for _, response := range responses {
100100
endpoints, err := response.ForChannel(s.channelID).Peers()
101101
if err != nil {
102-
lastErr = errors.Wrapf(err, "error getting peers from discovery response")
102+
lastErr = errors.Wrap(err, "error getting peers from discovery response")
103103
logger.Warn(lastErr.Error())
104104
continue
105105
}

‎pkg/client/common/discovery/dynamicdiscovery/localprovider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ func (p *LocalProvider) CreateLocalDiscoveryService(mspID string) (fab.Discovery
4343

4444
// Close will close the cache and all services contained by the cache.
4545
func (p *LocalProvider) Close() {
46-
logger.Debugf("Closing local provider cache")
46+
logger.Debug("Closing local provider cache")
4747
p.cache.Close()
4848
}

‎pkg/client/common/discovery/dynamicdiscovery/localservice.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type LocalService struct {
2424

2525
// newLocalService creates a Local Discovery Service to query the list of member peers in the local MSP.
2626
func newLocalService(config fab.EndpointConfig, mspID string, opts ...coptions.Opt) *LocalService {
27-
logger.Debugf("Creating new local discovery service")
27+
logger.Debug("Creating new local discovery service")
2828

2929
s := &LocalService{mspID: mspID}
3030
s.service = newService(config, s.queryPeers, opts...)
@@ -50,7 +50,7 @@ func (s *LocalService) localContext() contextAPI.Local {
5050
}
5151

5252
func (s *LocalService) queryPeers() ([]fab.Peer, error) {
53-
logger.Debugf("Refreshing local peers from discovery service...")
53+
logger.Debug("Refreshing local peers from discovery service...")
5454

5555
ctx := s.localContext()
5656
if ctx == nil {
@@ -68,16 +68,16 @@ func (s *LocalService) queryPeers() ([]fab.Peer, error) {
6868
req := discclient.NewRequest().AddLocalPeersQuery()
6969
responses, err := s.discoveryClient().Send(reqCtx, req, *target)
7070
if err != nil {
71-
return nil, errors.Wrapf(err, "error calling discover service send")
71+
return nil, errors.Wrap(err, "error calling discover service send")
7272
}
7373
if len(responses) == 0 {
74-
return nil, errors.Wrapf(err, "expecting 1 response from discover service send but got none")
74+
return nil, errors.Wrap(err, "expecting 1 response from discover service send but got none")
7575
}
7676

7777
response := responses[0]
7878
endpoints, err := response.ForLocal().Peers()
7979
if err != nil {
80-
return nil, errors.Wrapf(err, "error getting peers from discovery response")
80+
return nil, errors.Wrap(err, "error getting peers from discovery response")
8181
}
8282

8383
return s.filterLocalMSP(asPeers(ctx, endpoints)), nil

‎pkg/client/common/discovery/dynamicdiscovery/opts.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type options struct {
2121
// peer cache is refreshed
2222
func WithRefreshInterval(value time.Duration) coptions.Opt {
2323
return func(p coptions.Params) {
24-
logger.Debugf("Checking refreshIntervalSetter")
24+
logger.Debug("Checking refreshIntervalSetter")
2525
if setter, ok := p.(refreshIntervalSetter); ok {
2626
setter.SetRefreshInterval(value)
2727
}
@@ -31,7 +31,7 @@ func WithRefreshInterval(value time.Duration) coptions.Opt {
3131
// WithResponseTimeout sets the Discover service response timeout
3232
func WithResponseTimeout(value time.Duration) coptions.Opt {
3333
return func(p coptions.Params) {
34-
logger.Debugf("Checking responseTimeoutSetter")
34+
logger.Debug("Checking responseTimeoutSetter")
3535
if setter, ok := p.(responseTimeoutSetter); ok {
3636
setter.SetResponseTimeout(value)
3737
}

‎pkg/client/common/discovery/dynamicdiscovery/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (s *service) initialize(ctx contextAPI.Client) error {
8181

8282
discoveryClient, err := clientProvider(ctx)
8383
if err != nil {
84-
return errors.Wrapf(err, "error creating discover client")
84+
return errors.Wrap(err, "error creating discover client")
8585
}
8686

8787
logger.Debugf("Initializing with context: %#v", ctx)
@@ -92,7 +92,7 @@ func (s *service) initialize(ctx contextAPI.Client) error {
9292

9393
// Close stops the lazyref background refresh
9494
func (s *service) Close() {
95-
logger.Debugf("Closing peers ref...")
95+
logger.Debug("Closing peers ref...")
9696
s.peersRef.Close()
9797
}
9898

‎pkg/client/common/filter/endpoint_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestInvalidOpt(t *testing.T) {
2424

2525
peer := mocks.NewMockPeer("Peer1", "example.com")
2626
if !ef.Accept(peer) {
27-
t.Fatalf("Should have accepted peer")
27+
t.Fatal("Should have accepted peer")
2828
}
2929

3030
}
@@ -39,13 +39,13 @@ func TestChaincodeQueryFilter(t *testing.T) {
3939
ef := NewEndpointFilter(channel, ChaincodeQuery)
4040

4141
if !ef.Accept(mocks.NewMockPeer("Peer1", "non-configured.com")) {
42-
t.Fatalf("Should have accepted peer that is not configured")
42+
t.Fatal("Should have accepted peer that is not configured")
4343
}
4444

4545
// Configured peer
4646
peer := mocks.NewMockPeer("Peer1", "example.com")
4747
if !ef.Accept(peer) {
48-
t.Fatalf("Should have accepted peer")
48+
t.Fatal("Should have accepted peer")
4949
}
5050

5151
channel, err = mocks.NewMockChannel("noEndpoints")
@@ -54,7 +54,7 @@ func TestChaincodeQueryFilter(t *testing.T) {
5454
t.Fatalf("Failed to create mock channel: %s", err)
5555
}
5656
if ef.Accept(peer) {
57-
t.Fatalf("Should NOT have accepted peer since peers chaincode query option is configured to false")
57+
t.Fatal("Should NOT have accepted peer since peers chaincode query option is configured to false")
5858
}
5959

6060
channel, err = mocks.NewMockChannel("noChannelPeers")
@@ -63,7 +63,7 @@ func TestChaincodeQueryFilter(t *testing.T) {
6363
t.Fatalf("Failed to create mock channel: %s", err)
6464
}
6565
if !ef.Accept(peer) {
66-
t.Fatalf("Should have accepted peer since no peers configured")
66+
t.Fatal("Should have accepted peer since no peers configured")
6767
}
6868

6969
}
@@ -79,7 +79,7 @@ func TestLedgerQueryFilter(t *testing.T) {
7979

8080
peer := mocks.NewMockPeer("Peer1", "example.com")
8181
if !ef.Accept(peer) {
82-
t.Fatalf("Should have accepted peer")
82+
t.Fatal("Should have accepted peer")
8383
}
8484

8585
}
@@ -95,7 +95,7 @@ func TestEndorsingPeerFilter(t *testing.T) {
9595

9696
peer := mocks.NewMockPeer("Peer1", "example.com")
9797
if !ef.Accept(peer) {
98-
t.Fatalf("Should have accepted peer")
98+
t.Fatal("Should have accepted peer")
9999
}
100100

101101
}
@@ -111,7 +111,7 @@ func TestEventSourceFilter(t *testing.T) {
111111

112112
peer := mocks.NewMockPeer("Peer1", "example.com")
113113
if !ef.Accept(peer) {
114-
t.Fatalf("Should have accepted peer")
114+
t.Fatal("Should have accepted peer")
115115
}
116116

117117
}

0 commit comments

Comments
 (0)
⚡