Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/viperutil/config_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func pemBlocksFromFileDecodeHook(f reflect.Kind, t reflect.Kind, data interface{
}

func bccspHook(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
if t != reflect.TypeOf(&factory.FactoryOpts{}) {
if t != reflect.TypeFor[*factory.FactoryOpts]() {
return data, nil
}

Expand Down
2 changes: 1 addition & 1 deletion discovery/cmd/endorsers.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (parser *EndorserResponseParser) ParseResponse(channel string, res ServiceR

ccQueryRes := rawResponse.Results[0].GetCcQueryRes()
if ccQueryRes == nil {
return errors.Errorf("server returned response of unexpected type: %v", reflect.TypeOf(rawResponse.Results[0]))
return errors.Errorf("server returned response of unexpected type: %v", reflect.TypeFor[*discovery.QueryResult]())
}

jsonBytes, _ := json.MarshalIndent(parseEndorsementDescriptors(ccQueryRes.Content), "", "\t")
Expand Down
2 changes: 1 addition & 1 deletion gossip/comm/comm_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ func (c *commImpl) SendWithAck(msg *protoext.SignedGossipMessage, timeout time.D
return err
}
if msg, isAck := msg.(*proto.Acknowledgement); !isAck {
return errors.Errorf("received a message of type %s, expected *proto.Acknowledgement", reflect.TypeOf(msg))
return errors.Errorf("received a message of type %s, expected *proto.Acknowledgement", reflect.TypeFor[*proto.Acknowledgement]())
} else {
if msg.Error != "" {
return errors.New(msg.Error)
Expand Down