mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-19 14:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

proto: improve enums (#5099)

Browse Source 
Fixes some minor issues with Protobuf enums, not likely to break anything.

Branched off of #5096, rebase to `master` before merging.
This commit is contained in:
Erik Grinaker
2020-07-08 13:49:50 +00:00
committed by GitHub
parent bf3c87c864
commit 59a17b28a7
9 changed files with 358 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
statesync/syncer.go
+1 -1
View File
@@ -303,7 +303,7 @@ func (s *syncer) offerSnapshot(snapshot *snapshot) error {
case abci.ResponseOfferSnapshot_REJECT_SENDER:
return errRejectSender
default:
return fmt.Errorf("invalid ResponseOfferSnapshot result %v", resp.Result)
return fmt.Errorf("unknown ResponseOfferSnapshot result %v", resp.Result)
}
}
statesync/syncer_test.go
+18 -16
View File
@@ -214,7 +214,7 @@ func TestSyncer_SyncAny_noSnapshots(t *testing.T) {
assert.Equal(t, errNoSnapshots, err)
}
func TestSyncer_SyncAny_ABORT(t *testing.T) {
func TestSyncer_SyncAny_abort(t *testing.T) {
syncer, connSnapshot := setupOfferSyncer(t)
s := &snapshot{Height: 1, Format: 1, Chunks: 3, Hash: []byte{1, 2, 3}}
@@ -256,7 +256,7 @@ func TestSyncer_SyncAny_reject(t *testing.T) {
connSnapshot.AssertExpectations(t)
}
func TestSyncer_SyncAny_REJECT_FORMAT(t *testing.T) {
func TestSyncer_SyncAny_reject_format(t *testing.T) {
syncer, connSnapshot := setupOfferSyncer(t)
// s22 is tried first, which reject s22 and s12, then s11 will abort.
@@ -342,13 +342,14 @@ func TestSyncer_offerSnapshot(t *testing.T) {
err error
expectErr error
}{
"accept": {abci.ResponseOfferSnapshot_ACCEPT, nil, nil},
"abort": {abci.ResponseOfferSnapshot_ABORT, nil, errAbort},
"reject": {abci.ResponseOfferSnapshot_REJECT, nil, errRejectSnapshot},
"reject_format": {abci.ResponseOfferSnapshot_REJECT_FORMAT, nil, errRejectFormat},
"reject_sender": {abci.ResponseOfferSnapshot_REJECT_SENDER, nil, errRejectSender},
"error": {0, boom, boom},
"unknown result": {9, nil, unknownErr},
"accept": {abci.ResponseOfferSnapshot_ACCEPT, nil, nil},
"abort": {abci.ResponseOfferSnapshot_ABORT, nil, errAbort},
"reject": {abci.ResponseOfferSnapshot_REJECT, nil, errRejectSnapshot},
"reject_format": {abci.ResponseOfferSnapshot_REJECT_FORMAT, nil, errRejectFormat},
"reject_sender": {abci.ResponseOfferSnapshot_REJECT_SENDER, nil, errRejectSender},
"unknown": {abci.ResponseOfferSnapshot_UNKNOWN, nil, unknownErr},
"error": {0, boom, boom},
"unknown non-zero": {9, nil, unknownErr},
}
for name, tc := range testcases {
tc := tc
@@ -382,13 +383,14 @@ func TestSyncer_applyChunks_Results(t *testing.T) {
err error
expectErr error
}{
"accept": {abci.ResponseApplySnapshotChunk_ACCEPT, nil, nil},
"abort": {abci.ResponseApplySnapshotChunk_ABORT, nil, errAbort},
"retry": {abci.ResponseApplySnapshotChunk_RETRY, nil, nil},
"retry_snapshot": {abci.ResponseApplySnapshotChunk_RETRY_SNAPSHOT, nil, errRetrySnapshot},
"reject_snapshot": {abci.ResponseApplySnapshotChunk_REJECT_SNAPSHOT, nil, errRejectSnapshot},
"error": {0, boom, boom},
"unknown result": {9, nil, unknownErr},
"accept": {abci.ResponseApplySnapshotChunk_ACCEPT, nil, nil},
"abort": {abci.ResponseApplySnapshotChunk_ABORT, nil, errAbort},
"retry": {abci.ResponseApplySnapshotChunk_RETRY, nil, nil},
"retry_snapshot": {abci.ResponseApplySnapshotChunk_RETRY_SNAPSHOT, nil, errRetrySnapshot},
"reject_snapshot": {abci.ResponseApplySnapshotChunk_REJECT_SNAPSHOT, nil, errRejectSnapshot},
"unknown": {abci.ResponseApplySnapshotChunk_UNKNOWN, nil, unknownErr},
"error": {0, boom, boom},
"unknown non-zero": {9, nil, unknownErr},
}
for name, tc := range testcases {
tc := tc