zolfa
/
tendermint
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 221 Wiki Activity
Browse Source

Remove BeginBlock

pull/1780/head
Jae Kwon 9 years ago
parent
36c25f242f
commit
61c34ade0d
7 changed files with 59 additions and 92 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -8
      README.md
  2. +4
    -17
      client/client.go
  3. +1
    -1
      server/server.go
  4. +1
    -4
      types/application.go
  5. +2
    -14
      types/messages.go
  6. +46
    -47
      types/types.pb.go
  7. +1
    -1
      types/types.proto

+ 4
- 8
README.md View File

@ -73,13 +73,9 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil
* __Usage__:<br/>
Called once upon genesis
#### BeginBlock
* __Arguments__:
* `Height (uint64)`: Block number
* __Usage__:<br/>
Signals the beginning of a block
#### EndBlock
* __Arguments__:
* `Height (uint64)`: The block height that ended
* __Returns__:
* `Validators ([]Validator)`: Changed validators with new voting powers (0 to remove)
* __Usage__:<br/>
@ -87,9 +83,9 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil
## Changelog
### Feb 28th, 2016
### Mar 6th, 2016
* Added InitChain, BeginBlock, EndBlock
* Added InitChain, EndBlock
### Feb 14th, 2016


+ 4
- 17
client/client.go View File

@ -219,12 +219,8 @@ func (cli *Client) InitChainAsync(validators []*types.Validator) *ReqRes {
return cli.queueRequest(types.RequestInitChain(validators))
}
func (cli *Client) BeginBlockAsync(height uint64) *ReqRes {
return cli.queueRequest(types.RequestBeginBlock(height))
}
func (cli *Client) EndBlockAsync() *ReqRes {
return cli.queueRequest(types.RequestEndBlock())
func (cli *Client) EndBlockAsync(height uint64) *ReqRes {
return cli.queueRequest(types.RequestEndBlock(height))
}
//----------------------------------------
@ -301,17 +297,8 @@ func (cli *Client) InitChainSync(validators []*types.Validator) (err error) {
return nil
}
func (cli *Client) BeginBlockSync(height uint64) (err error) {
cli.queueRequest(types.RequestBeginBlock(height))
cli.FlushSync()
if cli.err != nil {
return cli.err
}
return nil
}
func (cli *Client) EndBlockSync() (validators []*types.Validator, err error) {
reqres := cli.queueRequest(types.RequestEndBlock())
func (cli *Client) EndBlockSync(height uint64) (validators []*types.Validator, err error) {
reqres := cli.queueRequest(types.RequestEndBlock(height))
cli.FlushSync()
if cli.err != nil {
return nil, cli.err


+ 1
- 1
server/server.go View File

@ -157,7 +157,7 @@ func (s *Server) handleRequest(req *types.Request, responses chan<- *types.Respo
}
case types.MessageType_EndBlock:
if app, ok := s.app.(types.BlockchainAware); ok {
validators := app.EndBlock()
validators := app.EndBlock(req.Height)
responses <- types.ResponseEndBlock(validators)
} else {
responses <- types.ResponseEndBlock(nil)


+ 1
- 4
types/application.go View File

@ -29,10 +29,7 @@ type BlockchainAware interface {
// validators: genesis validators from TendermintCore
InitChain(validators []*Validator)
// Signals the beginning of a block
BeginBlock(height uint64)
// Signals the end of a block
// validators: changed validators from app to TendermintCore
EndBlock() (validators []*Validator)
EndBlock(height uint64) (validators []*Validator)
}

+ 2
- 14
types/messages.go View File

@ -68,19 +68,13 @@ func RequestInitChain(validators []*Validator) *Request {
}
}
func RequestBeginBlock(height uint64) *Request {
func RequestEndBlock(height uint64) *Request {
return &Request{
Type: MessageType_BeginBlock,
Type: MessageType_EndBlock,
Height: height,
}
}
func RequestEndBlock() *Request {
return &Request{
Type: MessageType_EndBlock,
}
}
//----------------------------------------
func ResponseException(errStr string) *Response {
@ -158,12 +152,6 @@ func ResponseInitChain() *Response {
}
}
func ResponseBeginBlock() *Response {
return &Response{
Type: MessageType_BeginBlock,
}
}
func ResponseEndBlock(validators []*Validator) *Response {
return &Response{
Type: MessageType_EndBlock,


+ 46
- 47
types/types.pb.go View File

@ -38,8 +38,8 @@ const (
MessageType_Commit MessageType = 19
MessageType_Query MessageType = 20
MessageType_InitChain MessageType = 21
MessageType_BeginBlock MessageType = 22
MessageType_EndBlock MessageType = 23
// BeginBlock = 0x16; NOT USED
MessageType_EndBlock MessageType = 23
)
var MessageType_name = map[int32]string{
@ -54,7 +54,6 @@ var MessageType_name = map[int32]string{
19: "Commit",
20: "Query",
21: "InitChain",
22: "BeginBlock",
23: "EndBlock",
}
var MessageType_value = map[string]int32{
@ -69,7 +68,6 @@ var MessageType_value = map[string]int32{
"Commit": 19,
"Query": 20,
"InitChain": 21,
"BeginBlock": 22,
"EndBlock": 23,
}
@ -81,7 +79,8 @@ func (MessageType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []
type CodeType int32
const (
CodeType_OK CodeType = 0
CodeType_OK CodeType = 0
// General response codes, 0 ~ 99
CodeType_InternalError CodeType = 1
CodeType_EncodingError CodeType = 2
CodeType_BadNonce CodeType = 3
@ -225,46 +224,46 @@ func init() {
}
var fileDescriptor0 = []byte{
// 654 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x4f, 0xdb, 0x40,
0x10, 0xad, 0x13, 0x27, 0x24, 0x13, 0x08, 0x9b, 0x6d, 0x02, 0x69, 0x4f, 0x88, 0x4a, 0x15, 0xe2,
0x40, 0x2b, 0x7a, 0xea, 0x91, 0xa4, 0x01, 0x45, 0x88, 0x8f, 0xba, 0xc0, 0xdd, 0x38, 0x93, 0x78,
0x1b, 0xb3, 0xeb, 0xda, 0x6b, 0x20, 0x3d, 0xf7, 0x3f, 0x55, 0xea, 0xbd, 0x87, 0x7e, 0x7f, 0xfc,
0xa2, 0xce, 0xda, 0x4e, 0x08, 0xe5, 0xd0, 0x43, 0x2f, 0xd1, 0xbe, 0x37, 0xb3, 0xf3, 0xde, 0x1b,
0xaf, 0x02, 0x0d, 0x3d, 0x09, 0x31, 0x7e, 0x92, 0xfe, 0x6e, 0x85, 0x91, 0xd2, 0x8a, 0x97, 0x52,
0xb0, 0xfe, 0xde, 0x82, 0x05, 0x07, 0xdf, 0x24, 0x18, 0x6b, 0xfe, 0x18, 0x6c, 0x43, 0xb6, 0xad,
0x35, 0x6b, 0xa3, 0xbe, 0xcd, 0xb7, 0xb2, 0xf6, 0x03, 0x8c, 0x63, 0x77, 0x84, 0x27, 0x04, 0x9c,
0xb4, 0xce, 0x39, 0xd8, 0x03, 0x57, 0xbb, 0xed, 0x02, 0xf5, 0x2d, 0x3a, 0xe9, 0x99, 0x33, 0x28,
0x8e, 0x71, 0xd2, 0x2e, 0x12, 0x55, 0x75, 0xcc, 0x91, 0x37, 0xa1, 0x74, 0xe9, 0x06, 0x09, 0xb6,
0xed, 0x94, 0xcb, 0x00, 0x7f, 0x0a, 0x40, 0x07, 0x41, 0x77, 0x54, 0x14, 0xb7, 0x4b, 0x6b, 0xc5,
0x8d, 0xda, 0x36, 0xcb, 0x95, 0xce, 0xa6, 0x05, 0x67, 0xae, 0x87, 0xaf, 0x40, 0xd9, 0x47, 0x31,
0xf2, 0x75, 0xbb, 0x4c, 0x83, 0x6c, 0x27, 0x47, 0xeb, 0x1f, 0x2d, 0xa8, 0x38, 0x18, 0x87, 0x4a,
0xc6, 0xf8, 0x5f, 0xd6, 0x1f, 0x81, 0xed, 0xa9, 0x01, 0xa6, 0xde, 0xeb, 0xdb, 0xcb, 0xf9, 0xdd,
0x2e, 0x51, 0xd9, 0x45, 0x53, 0x34, 0x69, 0x30, 0x8a, 0x54, 0x34, 0x4d, 0x93, 0x02, 0x93, 0x3a,
0x50, 0x23, 0x8a, 0x91, 0xa6, 0xa6, 0xe3, 0x5f, 0xf9, 0xca, 0xff, 0xce, 0xb7, 0xfe, 0x1c, 0xaa,
0xb3, 0x82, 0x09, 0x1b, 0x26, 0xe7, 0xfb, 0xb4, 0x49, 0x2b, 0x75, 0x98, 0x23, 0x23, 0x1f, 0xaa,
0x2b, 0x8c, 0x52, 0xe3, 0xb6, 0x93, 0x81, 0xcd, 0x0f, 0x16, 0xd4, 0xe6, 0x32, 0xf2, 0x65, 0xa8,
0x1d, 0x26, 0x41, 0x90, 0x53, 0xec, 0x1e, 0xaf, 0x80, 0xdd, 0xf3, 0x7c, 0xc5, 0x2c, 0x5e, 0x85,
0xd2, 0x6e, 0x90, 0xc4, 0x3e, 0x2b, 0x18, 0xb2, 0x2f, 0x87, 0x8a, 0x15, 0xf9, 0x12, 0x54, 0x5f,
0xa1, 0x3e, 0x0a, 0xb5, 0x50, 0x92, 0xd9, 0x06, 0xf6, 0xae, 0x3d, 0xcc, 0x60, 0x89, 0x2f, 0x42,
0x65, 0x27, 0x0c, 0x51, 0x0e, 0x4e, 0xae, 0x59, 0x83, 0xd7, 0x60, 0xa1, 0xeb, 0xa3, 0x37, 0x26,
0x40, 0x5b, 0x84, 0x72, 0x57, 0x5d, 0x5c, 0x08, 0xcd, 0xee, 0x9b, 0xc9, 0x2f, 0x13, 0x8c, 0x26,
0xac, 0x69, 0x06, 0xf4, 0xa5, 0xd0, 0x5d, 0xdf, 0x15, 0x92, 0xb5, 0x78, 0x1d, 0xa0, 0x83, 0x23,
0x21, 0x3b, 0x81, 0xf2, 0xc6, 0x6c, 0xc5, 0x0c, 0xec, 0xc9, 0x41, 0x86, 0x56, 0x37, 0xdf, 0xd9,
0x50, 0x99, 0x2e, 0x99, 0x97, 0xa1, 0x70, 0xb4, 0x4f, 0x86, 0x1b, 0xb0, 0xd4, 0x97, 0x1a, 0x23,
0xe9, 0x06, 0x3d, 0xb3, 0x61, 0x72, 0x4e, 0x54, 0x4f, 0xd2, 0x37, 0x10, 0x72, 0x94, 0x51, 0x05,
0x33, 0xa8, 0xe3, 0x0e, 0x0e, 0x95, 0xf4, 0x90, 0x52, 0x30, 0x58, 0x3c, 0x95, 0x6e, 0xa2, 0x7d,
0x15, 0x89, 0xb7, 0x38, 0xa0, 0x20, 0x2d, 0x68, 0xf4, 0x65, 0x9c, 0x0c, 0x87, 0xc2, 0x13, 0x28,
0xf5, 0x6e, 0x22, 0x07, 0x31, 0x05, 0xe2, 0x50, 0x3f, 0x95, 0x63, 0xa9, 0xae, 0x64, 0xfe, 0xe2,
0x59, 0xd9, 0xb4, 0x76, 0xdc, 0x18, 0x6f, 0x2b, 0xa0, 0x99, 0x69, 0xe8, 0x99, 0xca, 0x90, 0xbe,
0x0c, 0x37, 0x4c, 0x3e, 0x60, 0xc7, 0xf3, 0x54, 0x22, 0x35, 0x1b, 0xd1, 0x97, 0x61, 0x19, 0x3f,
0xe7, 0xc0, 0xe7, 0x0f, 0xa0, 0x65, 0xd8, 0xbb, 0x2e, 0x04, 0x6f, 0x43, 0xf3, 0x4e, 0x09, 0x31,
0x66, 0xaf, 0xc9, 0x0b, 0xdb, 0x53, 0x97, 0xb9, 0x42, 0x4f, 0x6a, 0xa1, 0x27, 0xec, 0x93, 0x45,
0x0a, 0xcb, 0x37, 0xf4, 0x5e, 0xa4, 0x92, 0x90, 0x7d, 0xb6, 0x6e, 0x37, 0x1f, 0xe0, 0xc5, 0x39,
0x46, 0xec, 0x8b, 0xc5, 0x57, 0x81, 0xdf, 0xd0, 0xc7, 0x91, 0x0a, 0x55, 0xec, 0x06, 0xec, 0xeb,
0xb4, 0xf0, 0x22, 0x09, 0x03, 0xe1, 0xb9, 0x1a, 0xf3, 0xf1, 0xdf, 0x2c, 0x0a, 0xd6, 0x98, 0x2f,
0x64, 0x02, 0xdf, 0xef, 0x5c, 0xc8, 0x25, 0x7e, 0x58, 0x94, 0xad, 0x39, 0x5f, 0x98, 0x89, 0xfc,
0x9c, 0x9a, 0x9a, 0x95, 0xce, 0x94, 0x46, 0xf6, 0xcb, 0xe2, 0x0f, 0xa1, 0x45, 0x74, 0x5f, 0xa6,
0xaf, 0x9e, 0x48, 0x5a, 0xf4, 0xb1, 0x79, 0xc0, 0xec, 0xb7, 0x75, 0x5e, 0x4e, 0xff, 0x8e, 0x9e,
0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x69, 0x85, 0x09, 0xa3, 0x04, 0x00, 0x00,
// 649 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcb, 0x52, 0xdb, 0x4a,
0x10, 0xbd, 0x63, 0xcb, 0xc6, 0x6e, 0xf3, 0x18, 0xcf, 0xb5, 0x2f, 0xba, 0x77, 0x45, 0x71, 0xab,
0x52, 0x14, 0x0b, 0x92, 0x22, 0xab, 0x2c, 0xc1, 0x31, 0x94, 0x8b, 0xe2, 0x11, 0x05, 0xd8, 0x0b,
0xa9, 0x6d, 0x29, 0x16, 0x33, 0x8a, 0x34, 0x02, 0x9c, 0x75, 0xbe, 0x26, 0x3f, 0x90, 0x2f, 0xc8,
0x22, 0xef, 0xc7, 0x17, 0xa5, 0x47, 0x92, 0x8d, 0x09, 0x8b, 0x2c, 0xb2, 0x71, 0xcd, 0x39, 0xdd,
0xd3, 0xe7, 0x9c, 0xd6, 0x94, 0xa1, 0xad, 0x27, 0x31, 0xa6, 0x0f, 0xf3, 0xdf, 0xad, 0x38, 0x51,
0x5a, 0x89, 0x5a, 0x0e, 0xd6, 0xdf, 0x32, 0x58, 0x70, 0xf0, 0x65, 0x86, 0xa9, 0x16, 0x0f, 0xc0,
0x32, 0xa4, 0xcd, 0xd6, 0xd8, 0xc6, 0xf2, 0xb6, 0xd8, 0x2a, 0xda, 0x0f, 0x31, 0x4d, 0xdd, 0x11,
0x9e, 0x12, 0x70, 0xf2, 0xba, 0x10, 0x60, 0xf9, 0xae, 0x76, 0xed, 0x0a, 0xf5, 0x2d, 0x3a, 0xf9,
0x59, 0x70, 0xa8, 0x8e, 0x71, 0x62, 0x57, 0x89, 0x6a, 0x3a, 0xe6, 0x28, 0x3a, 0x50, 0xbb, 0x72,
0xa3, 0x0c, 0x6d, 0x2b, 0xe7, 0x0a, 0x20, 0x1e, 0x01, 0xd0, 0x21, 0xa4, 0x3b, 0x2a, 0x49, 0xed,
0xda, 0x5a, 0x75, 0xa3, 0xb5, 0xcd, 0x4b, 0xa5, 0xf3, 0x69, 0xc1, 0x99, 0xeb, 0x11, 0xff, 0x40,
0x3d, 0xc0, 0x70, 0x14, 0x68, 0xbb, 0x4e, 0x83, 0x2c, 0xa7, 0x44, 0xeb, 0xef, 0x18, 0x34, 0x1c,
0x4c, 0x63, 0x25, 0x53, 0xfc, 0x23, 0xeb, 0xff, 0x83, 0xe5, 0x29, 0x1f, 0x73, 0xef, 0xcb, 0xdb,
0x2b, 0xe5, 0xdd, 0x1e, 0x51, 0xc5, 0x45, 0x53, 0x34, 0x69, 0x30, 0x49, 0x54, 0x32, 0x4d, 0x93,
0x03, 0x93, 0x3a, 0x52, 0x23, 0x8a, 0x91, 0xa7, 0xa6, 0xe3, 0x2f, 0xf9, 0xea, 0xbf, 0xcf, 0xb7,
0xfe, 0x04, 0x9a, 0xb3, 0x82, 0x09, 0x1b, 0x67, 0x17, 0x07, 0xb4, 0x49, 0x96, 0x3b, 0x2c, 0x91,
0x91, 0x8f, 0xd5, 0x35, 0x26, 0xb9, 0x71, 0xcb, 0x29, 0xc0, 0xe6, 0x1b, 0x06, 0xad, 0xb9, 0x8c,
0x62, 0x05, 0x5a, 0x47, 0x59, 0x14, 0x95, 0x14, 0xff, 0x4b, 0x34, 0xc0, 0xea, 0x7b, 0x81, 0xe2,
0x4c, 0x34, 0xa1, 0xb6, 0x17, 0x65, 0x69, 0xc0, 0x2b, 0x86, 0x1c, 0xc8, 0xa1, 0xe2, 0x55, 0xb1,
0x04, 0xcd, 0xe7, 0xa8, 0x8f, 0x63, 0x1d, 0x2a, 0xc9, 0x2d, 0x03, 0xfb, 0x37, 0x1e, 0x16, 0xb0,
0x26, 0x16, 0xa1, 0xb1, 0x13, 0xc7, 0x28, 0xfd, 0xd3, 0x1b, 0xde, 0x16, 0x2d, 0x58, 0xe8, 0x05,
0xe8, 0x8d, 0x09, 0xd0, 0x16, 0xa1, 0xde, 0x53, 0x97, 0x97, 0xa1, 0xe6, 0x7f, 0x9b, 0xc9, 0xcf,
0x32, 0x4c, 0x26, 0xbc, 0x63, 0x06, 0x0c, 0x64, 0xa8, 0x7b, 0x81, 0x1b, 0x4a, 0xde, 0x35, 0x03,
0xfa, 0xd2, 0xdf, 0x8d, 0x94, 0x37, 0xe6, 0xab, 0x9b, 0xaf, 0x2d, 0x68, 0x4c, 0x97, 0x2a, 0xea,
0x50, 0x39, 0x3e, 0x20, 0x83, 0x6d, 0x58, 0x1a, 0x48, 0x8d, 0x89, 0x74, 0xa3, 0xbe, 0xd9, 0x28,
0x39, 0x25, 0xaa, 0x2f, 0x69, 0xe7, 0xa1, 0x1c, 0x15, 0x54, 0xc5, 0x0c, 0xda, 0x75, 0xfd, 0x23,
0x25, 0x3d, 0x24, 0xd7, 0x1c, 0x16, 0xcf, 0xa4, 0x9b, 0xe9, 0x40, 0x25, 0xe1, 0x2b, 0xf4, 0xc9,
0x78, 0x17, 0xda, 0x03, 0x99, 0x66, 0xc3, 0x61, 0xe8, 0x85, 0x28, 0xf5, 0x5e, 0x26, 0xfd, 0x94,
0x02, 0x08, 0x58, 0x3e, 0x93, 0x63, 0xa9, 0xae, 0x65, 0xf9, 0xc2, 0x79, 0xdd, 0xb4, 0xee, 0xba,
0x29, 0xde, 0x55, 0x40, 0x33, 0xd3, 0xd0, 0x33, 0x95, 0x21, 0x7d, 0x09, 0x61, 0x98, 0x72, 0xc0,
0x8e, 0xe7, 0xa9, 0x4c, 0x6a, 0x3e, 0xa2, 0x2f, 0xc1, 0x0b, 0x7e, 0xce, 0x41, 0x20, 0xfe, 0x85,
0xae, 0x61, 0xef, 0xbb, 0x08, 0x85, 0x0d, 0x9d, 0x7b, 0x25, 0xc4, 0x94, 0xbf, 0x20, 0x2f, 0x7c,
0x5f, 0x5d, 0x95, 0x0a, 0x7d, 0xa9, 0x43, 0x3d, 0xe1, 0xef, 0x19, 0x29, 0xac, 0xdc, 0xd2, 0xfb,
0x89, 0xca, 0x62, 0xfe, 0x81, 0xdd, 0x6d, 0x3e, 0xc4, 0xcb, 0x0b, 0x4c, 0xf8, 0x47, 0x26, 0x56,
0x41, 0xdc, 0xd2, 0x27, 0x89, 0x8a, 0x55, 0xea, 0x46, 0xfc, 0xd3, 0xb4, 0xf0, 0x34, 0x8b, 0xa3,
0xd0, 0x73, 0x35, 0x96, 0xe3, 0x3f, 0x33, 0x0a, 0xd6, 0x9e, 0x2f, 0x14, 0x02, 0x5f, 0xee, 0x5d,
0x28, 0x25, 0xbe, 0x32, 0xca, 0xd6, 0x99, 0x2f, 0xcc, 0x44, 0xbe, 0x4d, 0x4d, 0xcd, 0x4a, 0xe7,
0x4a, 0x23, 0xff, 0xce, 0xc4, 0x7f, 0xd0, 0x25, 0x7a, 0x20, 0xf3, 0x57, 0x4e, 0x24, 0x2d, 0xfa,
0xc4, 0x3c, 0x58, 0xfe, 0x83, 0x5d, 0xd4, 0xf3, 0xbf, 0x9f, 0xc7, 0x3f, 0x03, 0x00, 0x00, 0xff,
0xff, 0x7f, 0x32, 0xc0, 0xd9, 0x93, 0x04, 0x00, 0x00,
}

+ 1
- 1
types/types.proto View File

@ -19,7 +19,7 @@ enum MessageType {
Commit = 0x13;
Query = 0x14;
InitChain = 0x15;
BeginBlock = 0x16;
// BeginBlock = 0x16; NOT USED
EndBlock = 0x17;
}


Write Preview
Loading…
Cancel
Save