Skip to content
Open
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
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ with the repo to generate these mocks. [mockery](https://github.com/vektra/mocke
- the `--name` and `--dir` indicate where the 'source' interface is to be mocked

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
2 changes: 1 addition & 1 deletion core/endorser/endorser.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func (e *Endorser) ProcessProposal(ctx context.Context, signedProp *pb.SignedPro
}

// DRUNIX : do not install chaincode on committing-peer unless set explicitly using `CORE_PEER_INSTALLCCALLOWED=true`
isInstallCC := string(up.Input.Args[0]) == "InstallChaincode"
isInstallCC := len(up.Input.Args) > 0 && string(up.Input.Args[0]) == "InstallChaincode"
if isInstallCC && !viper.GetBool("peer.litepeer.enabled") && !viper.GetBool("peer.installccallowed") {
err := fmt.Errorf("Cannot install chaincode on committing-peer")
endorserLogger.Warn(err.Error())
Expand Down
6 changes: 2 additions & 4 deletions core/transientstore/keyvaluestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,8 @@ func (s *KVStore) PrivateDataHGetAllBatch(keys map[string]string) (map[string]ma
cmds[idx] = pipe.HGetAll(ctx, idx)
}
_, err := pipe.Exec(ctx)
if err != nil && err == redis.Nil {
logger.Errorf("error in retreiving PrivateDataHGetAllBatch value bytes : %+v", err)
} else if err != nil {
logger.Errorf("error executing PrivateDataHGetAllBatch pipeline :%v", err)
if err != nil && !errors.Is(err, redis.Nil) {
logger.Errorf("error executing PrivateDataHGetAllBatch pipeline: %v", err)
return nil, err
}

Expand Down