Commit 2a16532c authored by manish's avatar manish
Browse files

Move Blockstorage code under /fabric/common package

This changes introduced by this CR
- Moves the block storage code from package
core/ledger/blkstorage to common/ledger/blkstorage

- Splits the ledger_interface.go so as to move common interfaces
and data type to common/ledger package

- Moves some of the util functions to common/ledger package

- Moves core/ledger/ordererledger package to orderer/ledger/fsledger
orderer folks can futher rename/refactor this as seems suitable to them

Change-Id: I759e16f00dc2ec9bb62196121083cf48eae76948
Signed-off-by: default avatarmanish <>
parent e67a2382
...@@ -44,23 +44,9 @@ func (m *PeerEndpoint) GetID() *PeerID { ...@@ -44,23 +44,9 @@ func (m *PeerEndpoint) GetID() *PeerID {
return nil return nil
} }
// Contains information about the blockchain ledger such as height, current
// block hash, and previous block hash.
type BlockchainInfo struct {
Height uint64 `protobuf:"varint,1,opt,name=height" json:"height,omitempty"`
CurrentBlockHash []byte `protobuf:"bytes,2,opt,name=currentBlockHash,proto3" json:"currentBlockHash,omitempty"`
PreviousBlockHash []byte `protobuf:"bytes,3,opt,name=previousBlockHash,proto3" json:"previousBlockHash,omitempty"`
func (m *BlockchainInfo) Reset() { *m = BlockchainInfo{} }
func (m *BlockchainInfo) String() string { return proto.CompactTextString(m) }
func (*BlockchainInfo) ProtoMessage() {}
func (*BlockchainInfo) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
func init() { func init() {
proto.RegisterType((*PeerID)(nil), "protos.PeerID") proto.RegisterType((*PeerID)(nil), "protos.PeerID")
proto.RegisterType((*PeerEndpoint)(nil), "protos.PeerEndpoint") proto.RegisterType((*PeerEndpoint)(nil), "protos.PeerEndpoint")
proto.RegisterType((*BlockchainInfo)(nil), "protos.BlockchainInfo")
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
...@@ -138,24 +124,20 @@ var _Endorser_serviceDesc = grpc.ServiceDesc{ ...@@ -138,24 +124,20 @@ var _Endorser_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("peer/peer.proto", fileDescriptor5) } func init() { proto.RegisterFile("peer/peer.proto", fileDescriptor5) }
var fileDescriptor5 = []byte{ var fileDescriptor5 = []byte{
// 297 bytes of a gzipped FileDescriptorProto // 235 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x51, 0x4d, 0x6b, 0xf2, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
0x10, 0x7e, 0xf5, 0x15, 0xdb, 0x4e, 0x45, 0xdb, 0x2d, 0x48, 0x10, 0x29, 0x25, 0xa7, 0x7e, 0x61, 0x10, 0xc5, 0xdd, 0x22, 0xab, 0x8e, 0xe2, 0x42, 0x04, 0x29, 0x65, 0x11, 0xe9, 0x49, 0x11, 0x5a,
0xc0, 0xfe, 0x03, 0x51, 0x30, 0x37, 0x9b, 0xde, 0x7a, 0x29, 0x31, 0x19, 0x93, 0xa5, 0xba, 0xb3, 0x58, 0xbf, 0x81, 0xb4, 0x60, 0x6f, 0xb5, 0xde, 0xbc, 0x48, 0xdb, 0x8c, 0xdd, 0xc0, 0x6e, 0x26,
0xcc, 0xc4, 0x42, 0xaf, 0xfd, 0xe5, 0xc5, 0xdd, 0xa4, 0xa5, 0x78, 0xd9, 0x9d, 0x79, 0xbe, 0x60, 0xcc, 0xd4, 0x83, 0xdf, 0x5e, 0x9a, 0xb4, 0x82, 0x97, 0xfc, 0x79, 0xbf, 0xcc, 0xcb, 0xe3, 0xc1,
0x66, 0x60, 0x60, 0x11, 0x39, 0x3a, 0x3c, 0x13, 0xcb, 0x54, 0x91, 0xea, 0xba, 0x4f, 0x46, 0x57, 0xc6, 0x21, 0x72, 0x3e, 0x2d, 0x99, 0x63, 0x1a, 0x49, 0xad, 0xfd, 0x26, 0xc9, 0x4d, 0x00, 0x4c,
0x9e, 0x60, 0xb2, 0x24, 0xe9, 0xd6, 0x93, 0xa3, 0xf1, 0x1f, 0xf0, 0x8d, 0x51, 0x2c, 0x19, 0x41, 0x8e, 0xa4, 0x3d, 0x04, 0x98, 0x6c, 0xff, 0x89, 0x9f, 0x8c, 0xe2, 0xc8, 0x0a, 0x06, 0x9a, 0x6e,
0xcf, 0x86, 0x63, 0xe8, 0xae, 0x10, 0x39, 0x9e, 0x2b, 0x05, 0x1d, 0x93, 0xee, 0x30, 0x68, 0xdd, 0x61, 0x5d, 0x23, 0x72, 0x55, 0x28, 0x05, 0xa7, 0xb6, 0x3d, 0x62, 0xbc, 0xba, 0x5f, 0x3d, 0x5c,
0xb4, 0x6e, 0xcf, 0x12, 0x57, 0x87, 0x4b, 0xe8, 0x1d, 0xd8, 0x85, 0xc9, 0x2d, 0x69, 0x53, 0xa9, 0x34, 0xfe, 0x9c, 0xbe, 0xc2, 0xd5, 0x44, 0x4b, 0xab, 0x1d, 0x19, 0x3b, 0xaa, 0x3b, 0x88, 0xaa,
0x6b, 0x68, 0xc7, 0x73, 0xa7, 0x38, 0x9f, 0xf6, 0x7d, 0x82, 0x4c, 0xbc, 0x3f, 0x69, 0xc7, 0x73, 0xc2, 0xbf, 0xb8, 0xdc, 0x5d, 0x07, 0x07, 0xc9, 0xc2, 0x7c, 0x13, 0x55, 0x85, 0x8a, 0xe1, 0xac,
0x15, 0xc0, 0x49, 0x9a, 0xe7, 0x8c, 0x22, 0x41, 0xdb, 0xc5, 0x34, 0x6d, 0xf8, 0xd5, 0x82, 0xfe, 0xd5, 0x9a, 0x51, 0x24, 0x8e, 0xbc, 0xcd, 0x72, 0xdd, 0xbd, 0xc1, 0x79, 0x69, 0x35, 0xb1, 0x20,
0x6c, 0x4b, 0xd9, 0x7b, 0x56, 0xa6, 0xda, 0xc4, 0x66, 0x43, 0x6a, 0x08, 0xdd, 0x12, 0x75, 0x51, 0xab, 0x12, 0x36, 0x35, 0x53, 0x8f, 0x22, 0xf5, 0x9c, 0x4a, 0xdd, 0x2e, 0x66, 0xef, 0x66, 0xb0,
0x56, 0x2e, 0xb0, 0x93, 0xd4, 0x9d, 0xba, 0x87, 0x8b, 0x6c, 0xcf, 0x8c, 0xa6, 0x72, 0x86, 0x65, 0xa8, 0x17, 0x3d, 0x89, 0xff, 0x3e, 0x99, 0x95, 0x66, 0x8e, 0x9f, 0x9e, 0xbc, 0x3c, 0x7d, 0x3c,
0x2a, 0xa5, 0x4b, 0xeb, 0x25, 0x47, 0xb8, 0x7a, 0x84, 0x4b, 0xcb, 0xf8, 0xa1, 0x69, 0x2f, 0xbf, 0x0e, 0x66, 0xdc, 0x7f, 0x77, 0x59, 0x4f, 0xc7, 0x7c, 0xff, 0xe3, 0x90, 0x0f, 0xa8, 0x07, 0xe4,
0xe2, 0xff, 0x4e, 0x7c, 0x4c, 0x4c, 0x9f, 0xe1, 0x74, 0x61, 0x72, 0x62, 0x41, 0x56, 0x0b, 0x18, 0xfc, 0xab, 0xed, 0xd8, 0xf4, 0x79, 0x18, 0xf5, 0x45, 0x75, 0xa1, 0xa2, 0xe7, 0xdf, 0x00, 0x00,
0xac, 0x98, 0x32, 0x14, 0x59, 0xd5, 0xab, 0x51, 0xc3, 0x66, 0xa2, 0x17, 0x5d, 0x18, 0xcc, 0x1b, 0x00, 0xff, 0xff, 0x7f, 0x48, 0x87, 0xef, 0x3c, 0x01, 0x00, 0x00,
0x7c, 0x14, 0xfc, 0x4c, 0x5a, 0x23, 0x49, 0xbd, 0xc3, 0xf0, 0xdf, 0xec, 0xe1, 0xf5, 0xae, 0xd0,
0x55, 0xb9, 0x5f, 0x4f, 0x32, 0xda, 0x45, 0xe5, 0xa7, 0x45, 0xde, 0x62, 0x5e, 0x20, 0x47, 0x9b,
0x74, 0xcd, 0x3a, 0x8b, 0xbc, 0xd5, 0x5d, 0x6b, 0xed, 0xef, 0xf4, 0xf4, 0x1d, 0x00, 0x00, 0xff,
0xff, 0x33, 0xcf, 0xcc, 0xdb, 0xc1, 0x01, 0x00, 0x00,
} }
...@@ -31,16 +31,6 @@ message PeerEndpoint { ...@@ -31,16 +31,6 @@ message PeerEndpoint {
string address = 2; string address = 2;
} }
// Contains information about the blockchain ledger such as height, current
// block hash, and previous block hash.
message BlockchainInfo {
uint64 height = 1;
bytes currentBlockHash = 2;
bytes previousBlockHash = 3;
//-------- the Endorser service ------------ //-------- the Endorser service ------------
service Endorser { service Endorser {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment