mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-04 04:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

types: revert breaking change (#6538)

Browse Source 
## Description

revert #5523 to avoid breaking changes

cc @greg-szabo
This commit is contained in:
Marko
2021-06-07 08:26:47 +00:00
committed by GitHub
parent 00c284d9d7
commit eaa0468190
11 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_PENDING.md
View File

@@ -119,7 +119,6 @@ Friendly reminder: We have a [bug bounty program](https://hackerone.com/tendermi
### BUG FIXES
- [types] \#5523 Change json naming of `PartSetHeader` within `BlockID` from `parts` to `part_set_header` (@marbar3778)
- [privval] \#5638 Increase read/write timeout to 5s and calculate ping interval based on it (@JoeKash)
- [blockchain/v1] [\#5701](https://github.com/tendermint/tendermint/pull/5701) Handle peers without blocks (@melekes)
- [blockchain/v1] \#5711 Fix deadlock (@melekes)

8
light/mbt/json/MC4_4_faulty_Test2NotEnoughTrustFailure.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "0D038B1BA2ED7B1EF4D4E250C54D3F8D7186068658FAA53900CA83F4280B1EF2",
"part_set_header": {
"parts": {
"total": 1,
"hash": "0D038B1BA2ED7B1EF4D4E250C54D3F8D7186068658FAA53900CA83F4280B1EF2"
}
@@ -103,7 +103,7 @@
"round": 1,
"block_id": {
"hash": "734FC4AE3FEEAD34654D611A867E3A4F2F921DD2B8F27289EFC52C90EFC2B8D8",
"part_set_header": {
"parts": {
"total": 1,
"hash": "734FC4AE3FEEAD34654D611A867E3A4F2F921DD2B8F27289EFC52C90EFC2B8D8"
}
@@ -176,7 +176,7 @@
"round": 1,
"block_id": {
"hash": "E60D3DC5A38CE0773BF911BE62514F5FE6C12FA574F0571965E8EDE2D8899C01",
"part_set_header": {
"parts": {
"total": 1,
"hash": "E60D3DC5A38CE0773BF911BE62514F5FE6C12FA574F0571965E8EDE2D8899C01"
}
@@ -249,7 +249,7 @@
"round": 1,
"block_id": {
"hash": "2EA87BC69EB6739C5A1E06BCA5E7C9B8A5C163EB1ECF01EDD1A4A9B167C313C5",
"part_set_header": {
"parts": {
"total": 1,
"hash": "2EA87BC69EB6739C5A1E06BCA5E7C9B8A5C163EB1ECF01EDD1A4A9B167C313C5"
}

10
light/mbt/json/MC4_4_faulty_Test2NotEnoughTrustSuccess.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D",
"part_set_header": {
"parts": {
"total": 1,
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D"
}
@@ -130,7 +130,7 @@
"round": 1,
"block_id": {
"hash": "23DB6414C50B567947776438FC022CC24EA7489FFBA8025FAD5C4232046BE785",
"part_set_header": {
"parts": {
"total": 1,
"hash": "23DB6414C50B567947776438FC022CC24EA7489FFBA8025FAD5C4232046BE785"
}
@@ -212,7 +212,7 @@
"round": 1,
"block_id": {
"hash": "747249C8038E41C91EB3B737BAC2245F5F41B1527ABB7486C02CDF69C6B0DB53",
"part_set_header": {
"parts": {
"total": 1,
"hash": "747249C8038E41C91EB3B737BAC2245F5F41B1527ABB7486C02CDF69C6B0DB53"
}
@@ -285,7 +285,7 @@
"round": 1,
"block_id": {
"hash": "8F5D783FEDA6E53A6333DAB6324D567395D9189B4BBB51E3A9F2F360B667E928",
"part_set_header": {
"parts": {
"total": 1,
"hash": "8F5D783FEDA6E53A6333DAB6324D567395D9189B4BBB51E3A9F2F360B667E928"
}
@@ -403,7 +403,7 @@
"round": 1,
"block_id": {
"hash": "23DB6414C50B567947776438FC022CC24EA7489FFBA8025FAD5C4232046BE785",
"part_set_header": {
"parts": {
"total": 1,
"hash": "23DB6414C50B567947776438FC022CC24EA7489FFBA8025FAD5C4232046BE785"
}

12
light/mbt/json/MC4_4_faulty_Test3NotEnoughTrustFailure.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "F7DC6F348F04E01EC7DEA4348A3BFA2F0D7533900986EA66F6006C70BDD52D2E",
"part_set_header": {
"parts": {
"total": 1,
"hash": "F7DC6F348F04E01EC7DEA4348A3BFA2F0D7533900986EA66F6006C70BDD52D2E"
}
@@ -121,7 +121,7 @@
"round": 1,
"block_id": {
"hash": "A63EEADF3FB32E33B113FF28726100E2ACA295E7C467005BF35FB43ADC0D53C8",
"part_set_header": {
"parts": {
"total": 1,
"hash": "A63EEADF3FB32E33B113FF28726100E2ACA295E7C467005BF35FB43ADC0D53C8"
}
@@ -194,7 +194,7 @@
"round": 1,
"block_id": {
"hash": "13C32ED0F2BED33E19B4832CEEB6F949E822449F770B9B3A7F02254F391B7CD0",
"part_set_header": {
"parts": {
"total": 1,
"hash": "13C32ED0F2BED33E19B4832CEEB6F949E822449F770B9B3A7F02254F391B7CD0"
}
@@ -276,7 +276,7 @@
"round": 1,
"block_id": {
"hash": "E98C8412BF8736722EEBFF209C5D0AB9F82B599344D043139B4D4747E1FF21EE",
"part_set_header": {
"parts": {
"total": 1,
"hash": "E98C8412BF8736722EEBFF209C5D0AB9F82B599344D043139B4D4747E1FF21EE"
}
@@ -406,7 +406,7 @@
"round": 1,
"block_id": {
"hash": "A63EEADF3FB32E33B113FF28726100E2ACA295E7C467005BF35FB43ADC0D53C8",
"part_set_header": {
"parts": {
"total": 1,
"hash": "A63EEADF3FB32E33B113FF28726100E2ACA295E7C467005BF35FB43ADC0D53C8"
}
@@ -479,7 +479,7 @@
"round": 1,
"block_id": {
"hash": "13C32ED0F2BED33E19B4832CEEB6F949E822449F770B9B3A7F02254F391B7CD0",
"part_set_header": {
"parts": {
"total": 1,
"hash": "13C32ED0F2BED33E19B4832CEEB6F949E822449F770B9B3A7F02254F391B7CD0"
}

14
light/mbt/json/MC4_4_faulty_Test3NotEnoughTrustSuccess.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "C106084B050BDCC5AEBC414628992E43B6216544E19826BAB46027350C5FD3C5",
"part_set_header": {
"parts": {
"total": 1,
"hash": "C106084B050BDCC5AEBC414628992E43B6216544E19826BAB46027350C5FD3C5"
}
@@ -103,7 +103,7 @@
"round": 1,
"block_id": {
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3",
"part_set_header": {
"parts": {
"total": 1,
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3"
}
@@ -218,7 +218,7 @@
"round": 1,
"block_id": {
"hash": "0E61042148BB059117B880E371AEC93341630D01E665088844BC1D8DFA5B6B23",
"part_set_header": {
"parts": {
"total": 1,
"hash": "0E61042148BB059117B880E371AEC93341630D01E665088844BC1D8DFA5B6B23"
}
@@ -300,7 +300,7 @@
"round": 1,
"block_id": {
"hash": "FE0A34650DA8A9402EA231A4D03FD1F39E0D7F894456D7268A582244FB968605",
"part_set_header": {
"parts": {
"total": 1,
"hash": "FE0A34650DA8A9402EA231A4D03FD1F39E0D7F894456D7268A582244FB968605"
}
@@ -373,7 +373,7 @@
"round": 1,
"block_id": {
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3",
"part_set_header": {
"parts": {
"total": 1,
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3"
}
@@ -488,7 +488,7 @@
"round": 1,
"block_id": {
"hash": "0E61042148BB059117B880E371AEC93341630D01E665088844BC1D8DFA5B6B23",
"part_set_header": {
"parts": {
"total": 1,
"hash": "0E61042148BB059117B880E371AEC93341630D01E665088844BC1D8DFA5B6B23"
}
@@ -570,7 +570,7 @@
"round": 1,
"block_id": {
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3",
"part_set_header": {
"parts": {
"total": 1,
"hash": "EED66C25F857A3DA1443411CCB93DD943574A8A55F55C8E2248A129E270F9BE3"
}

8
light/mbt/json/MC4_4_faulty_TestFailure.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "658DEEC010B33EDB1977FA7B38087A8C547D65272F6A63854959E517AAD20597",
"part_set_header": {
"parts": {
"total": 1,
"hash": "658DEEC010B33EDB1977FA7B38087A8C547D65272F6A63854959E517AAD20597"
}
@@ -103,7 +103,7 @@
"round": 1,
"block_id": {
"hash": "32DD1A7D7E5C8106E14255B40F029DC568E3326512B50F45012580CD6683B9E6",
"part_set_header": {
"parts": {
"total": 1,
"hash": "32DD1A7D7E5C8106E14255B40F029DC568E3326512B50F45012580CD6683B9E6"
}
@@ -206,7 +206,7 @@
"round": 1,
"block_id": {
"hash": "A14AED7ED200C7F85F89C9A43029E0CE88691532193E198E3F45AA3375AE8D01",
"part_set_header": {
"parts": {
"total": 1,
"hash": "A14AED7ED200C7F85F89C9A43029E0CE88691532193E198E3F45AA3375AE8D01"
}
@@ -279,7 +279,7 @@
"round": 1,
"block_id": {
"hash": "AFABB1F6927F1D7845EA474BCF523AF948644C7B1301CBC17B8A264903B9AD16",
"part_set_header": {
"parts": {
"total": 1,
"hash": "AFABB1F6927F1D7845EA474BCF523AF948644C7B1301CBC17B8A264903B9AD16"
}

4
light/mbt/json/MC4_4_faulty_TestHeaderFromFuture.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "C106084B050BDCC5AEBC414628992E43B6216544E19826BAB46027350C5FD3C5",
"part_set_header": {
"parts": {
"total": 1,
"hash": "C106084B050BDCC5AEBC414628992E43B6216544E19826BAB46027350C5FD3C5"
}
@@ -103,7 +103,7 @@
"round": 1,
"block_id": {
"hash": "4A71282D7A0FA97B3809C24291E6894081710CDA0264FE31631BD524B8D62CB2",
"part_set_header": {
"parts": {
"total": 1,
"hash": "4A71282D7A0FA97B3809C24291E6894081710CDA0264FE31631BD524B8D62CB2"
}

10
light/mbt/json/MC4_4_faulty_TestSuccess.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D",
"part_set_header": {
"parts": {
"total": 1,
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D"
}
@@ -130,7 +130,7 @@
"round": 1,
"block_id": {
"hash": "EEF6A072BAD4A86F7B01A3E4D4E0920BA79F1FA8A25204F86697CA5C27885BF7",
"part_set_header": {
"parts": {
"total": 1,
"hash": "EEF6A072BAD4A86F7B01A3E4D4E0920BA79F1FA8A25204F86697CA5C27885BF7"
}
@@ -221,7 +221,7 @@
"round": 1,
"block_id": {
"hash": "6A1D90F13DCA0E65251D3DA8A07EA17A86CF79E340729DFEF165AC90FF9C2080",
"part_set_header": {
"parts": {
"total": 1,
"hash": "6A1D90F13DCA0E65251D3DA8A07EA17A86CF79E340729DFEF165AC90FF9C2080"
}
@@ -284,7 +284,7 @@
"round": 1,
"block_id": {
"hash": "DE957F0FC7A17229F36289714559F7FB5E908DEE04E549FF88DB72404E118581",
"part_set_header": {
"parts": {
"total": 1,
"hash": "DE957F0FC7A17229F36289714559F7FB5E908DEE04E549FF88DB72404E118581"
}
@@ -411,7 +411,7 @@
"round": 1,
"block_id": {
"hash": "EEF6A072BAD4A86F7B01A3E4D4E0920BA79F1FA8A25204F86697CA5C27885BF7",
"part_set_header": {
"parts": {
"total": 1,
"hash": "EEF6A072BAD4A86F7B01A3E4D4E0920BA79F1FA8A25204F86697CA5C27885BF7"
}

4
light/mbt/json/MC4_4_faulty_TestUntrustedBeforeTrusted.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D",
"part_set_header": {
"parts": {
"total": 1,
"hash": "6B68DB34DEF944920D6638B3AA84FE1DF790BC8BDC5189E201F23730D5756A9D"
}
@@ -130,7 +130,7 @@
"round": 1,
"block_id": {
"hash": "D1E7988F2C5B176E1AE1D7CA03F17A2734B1A90B154D41D0C01FEE49BA63DBAA",
"part_set_header": {
"parts": {
"total": 1,
"hash": "D1E7988F2C5B176E1AE1D7CA03F17A2734B1A90B154D41D0C01FEE49BA63DBAA"
}

8
light/mbt/json/MC4_4_faulty_TestValsetDifferentAllSteps.json
View File

@@ -26,7 +26,7 @@
"round": 1,
"block_id": {
"hash": "42C62AB26BDCD052FD7D87449C1CA700A79780D55E2FC8129614D4D2DC24CB08",
"part_set_header": {
"parts": {
"total": 1,
"hash": "42C62AB26BDCD052FD7D87449C1CA700A79780D55E2FC8129614D4D2DC24CB08"
}
@@ -121,7 +121,7 @@
"round": 1,
"block_id": {
"hash": "943FD341C1558245A93577E0A7CF48089B9E0FA175DE817A61EF7233AF810BF6",
"part_set_header": {
"parts": {
"total": 1,
"hash": "943FD341C1558245A93577E0A7CF48089B9E0FA175DE817A61EF7233AF810BF6"
}
@@ -194,7 +194,7 @@
"round": 1,
"block_id": {
"hash": "48A8E428AF500C9BD5674A9A2FC1217DD97B144FD623DDD2C4679022E19A5615",
"part_set_header": {
"parts": {
"total": 1,
"hash": "48A8E428AF500C9BD5674A9A2FC1217DD97B144FD623DDD2C4679022E19A5615"
}
@@ -282,7 +282,7 @@
"round": 1,
"block_id": {
"hash": "208411D47FC3C56A3243E8BA57010A144BAD926F2FEFFBFDFB695CF19D2788CF",
"part_set_header": {
"parts": {
"total": 1,
"hash": "208411D47FC3C56A3243E8BA57010A144BAD926F2FEFFBFDFB695CF19D2788CF"
}

2
types/block.go
View File

@@ -1172,7 +1172,7 @@ func (data *EvidenceData) FromProto(eviData *tmproto.EvidenceList) error {
// BlockID
type BlockID struct {
Hash tmbytes.HexBytes `json:"hash"`
PartSetHeader PartSetHeader `json:"part_set_header"`
PartSetHeader PartSetHeader `json:"parts"`
}
// Equals returns true if the BlockID matches the given BlockID