set explicit protobuf package names (#173)

pkg/hive/pb/hive.pb.go

@@ -119,24 +119,24 @@ func (m *BzzAddress) GetUnderlay() string {
 }
 
 func init() {
-	proto.RegisterType((*Peers)(nil), "pb.Peers")
-	proto.RegisterType((*BzzAddress)(nil), "pb.BzzAddress")
+	proto.RegisterType((*Peers)(nil), "hive.Peers")
+	proto.RegisterType((*BzzAddress)(nil), "hive.BzzAddress")
 }
 
 func init() { proto.RegisterFile("hive.proto", fileDescriptor_d635d1ead41ba02c) }
 
 var fileDescriptor_d635d1ead41ba02c = []byte{
-	// 156 bytes of a gzipped FileDescriptorProto
+	// 158 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xca, 0xc8, 0x2c, 0x4b,
-	0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xd2, 0xe5, 0x62, 0x0d, 0x48,
-	0x4d, 0x2d, 0x2a, 0x16, 0x52, 0xe1, 0x62, 0x2d, 0x00, 0x31, 0x24, 0x18, 0x15, 0x98, 0x35, 0xb8,
-	0x8d, 0xf8, 0xf4, 0x0a, 0x92, 0xf4, 0x9c, 0xaa, 0xaa, 0x1c, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b,
-	0x83, 0x20, 0x92, 0x4a, 0x4e, 0x5c, 0x5c, 0x08, 0x41, 0x21, 0x09, 0x2e, 0x76, 0xff, 0xb2, 0xd4,
-	0xa2, 0x9c, 0xc4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x9e, 0x20, 0x18, 0x57, 0x48, 0x8a, 0x8b,
-	0x23, 0x34, 0x2f, 0x05, 0x22, 0xc5, 0xa4, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe7, 0x3b, 0x49, 0x9c,
-	0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31,
-	0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x12, 0x1b, 0xd8, 0x5d, 0xc6, 0x80, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x55, 0x1e, 0x74, 0x45, 0xa5, 0x00, 0x00, 0x00,
+	0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0xb1, 0x95, 0xf4, 0xb9, 0x58, 0x03, 0x52,
+	0x53, 0x8b, 0x8a, 0x85, 0xd4, 0xb8, 0x58, 0x0b, 0x40, 0x0c, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e,
+	0x23, 0x01, 0x3d, 0xb0, 0x52, 0xa7, 0xaa, 0x2a, 0xc7, 0x94, 0x94, 0xa2, 0xd4, 0xe2, 0xe2, 0x20,
+	0x88, 0xb4, 0x92, 0x13, 0x17, 0x17, 0x42, 0x50, 0x48, 0x82, 0x8b, 0xdd, 0xbf, 0x2c, 0xb5, 0x28,
+	0x27, 0xb1, 0x52, 0x82, 0x51, 0x81, 0x51, 0x83, 0x27, 0x08, 0xc6, 0x15, 0x92, 0xe2, 0xe2, 0x08,
+	0xcd, 0x4b, 0x81, 0x48, 0x31, 0x29, 0x30, 0x6a, 0x70, 0x06, 0xc1, 0xf9, 0x4e, 0x32, 0x27, 0x1e,
+	0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17,
+	0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xc5, 0x54, 0x90, 0x94, 0xc4, 0x06, 0x76, 0x9f,
+	0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xed, 0x0e, 0xc1, 0x96, 0xad, 0x00, 0x00, 0x00,
 }
 
 func (m *Peers) Marshal() (dAtA []byte, err error) {

pkg/hive/pb/hive.proto

+// Copyright 2020 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 syntax = "proto3";
-package pb;
+
+package hive;
+
+option go_package = "pb";
 
 message Peers {
     repeated BzzAddress peers = 1;

pkg/p2p/libp2p/internal/handshake/pb/handshake.pb.go

@@ -179,28 +179,28 @@ func (m *Ack) GetAddress() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Syn)(nil), "pb.Syn")
-	proto.RegisterType((*SynAck)(nil), "pb.SynAck")
-	proto.RegisterType((*Ack)(nil), "pb.Ack")
+	proto.RegisterType((*Syn)(nil), "handshake.Syn")
+	proto.RegisterType((*SynAck)(nil), "handshake.SynAck")
+	proto.RegisterType((*Ack)(nil), "handshake.Ack")
 }
 
 func init() { proto.RegisterFile("handshake.proto", fileDescriptor_a77305914d5d202f) }
 
 var fileDescriptor_a77305914d5d202f = []byte{
-	// 196 bytes of a gzipped FileDescriptorProto
+	// 199 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcf, 0x48, 0xcc, 0x4b,
-	0x29, 0xce, 0x48, 0xcc, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52,
-	0x0a, 0xe6, 0x62, 0x0e, 0xae, 0xcc, 0x13, 0x92, 0xe0, 0x62, 0x77, 0x4c, 0x49, 0x29, 0x4a, 0x2d,
-	0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0x64, 0xb8, 0x38, 0xfd, 0x52,
-	0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x3d, 0x5d, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x83, 0x10, 0x02,
-	0x42, 0x22, 0x5c, 0xac, 0x3e, 0x99, 0xe9, 0x19, 0x25, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x1c, 0x41,
-	0x10, 0x8e, 0x92, 0x1d, 0x17, 0x5b, 0x70, 0x65, 0x9e, 0x63, 0x72, 0xb6, 0x90, 0x24, 0xd8, 0x78,
-	0xb0, 0x99, 0xdc, 0x46, 0xec, 0x7a, 0x05, 0x49, 0x7a, 0xc1, 0x95, 0x79, 0x41, 0x60, 0x2b, 0x25,
-	0xb9, 0x98, 0x1d, 0x93, 0xb3, 0xc1, 0x46, 0x42, 0xa5, 0x1c, 0x93, 0xb3, 0x83, 0x40, 0x62, 0x4a,
-	0xf2, 0x60, 0x29, 0xdc, 0x8e, 0x72, 0x92, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6,
-	0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39,
-	0x86, 0x24, 0x36, 0xb0, 0xd7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xac, 0x8b, 0xa0, 0x7f,
-	0xed, 0x00, 0x00, 0x00,
+	0x29, 0xce, 0x48, 0xcc, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0x0b, 0x28,
+	0x05, 0x73, 0x31, 0x07, 0x57, 0xe6, 0x09, 0x49, 0x70, 0xb1, 0x3b, 0xa6, 0xa4, 0x14, 0xa5, 0x16,
+	0x17, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0xc1, 0xb8, 0x42, 0x32, 0x5c, 0x9c, 0x7e, 0xa9,
+	0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x9e, 0x2e, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x08, 0x01,
+	0x21, 0x11, 0x2e, 0x56, 0x9f, 0xcc, 0xf4, 0x8c, 0x12, 0x09, 0x66, 0x05, 0x46, 0x0d, 0x8e, 0x20,
+	0x08, 0x47, 0xc9, 0x87, 0x8b, 0x2d, 0xb8, 0x32, 0xcf, 0x31, 0x39, 0x5b, 0x48, 0x01, 0x6c, 0x3c,
+	0xd8, 0x4c, 0x6e, 0x23, 0x3e, 0x3d, 0x84, 0x43, 0x82, 0x2b, 0xf3, 0x82, 0xc0, 0x36, 0x2b, 0x70,
+	0x31, 0x3b, 0x26, 0x67, 0x83, 0x4d, 0x46, 0x55, 0xe1, 0x98, 0x9c, 0x1d, 0x04, 0x92, 0x52, 0x92,
+	0x07, 0xab, 0xc0, 0xed, 0x44, 0x27, 0x99, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c,
+	0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63,
+	0x88, 0x62, 0x2a, 0x48, 0x4a, 0x62, 0x03, 0xfb, 0xd9, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x53,
+	0xfe, 0x4c, 0x62, 0x06, 0x01, 0x00, 0x00,
 }
 
 func (m *Syn) Marshal() (dAtA []byte, err error) {

pkg/p2p/libp2p/internal/handshake/pb/handshake.proto

 // Copyright 2020 The Swarm Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
+
 syntax = "proto3";
 
-package pb;
+package handshake;
+
+option go_package = "pb";
 
 message Syn {
     bytes Address = 1;

pkg/p2p/libp2p/internal/headers/pb/headers.pb.go

@@ -119,24 +119,24 @@ func (m *Header) GetValue() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Headers)(nil), "pb.Headers")
-	proto.RegisterType((*Header)(nil), "pb.Header")
+	proto.RegisterType((*Headers)(nil), "headers.Headers")
+	proto.RegisterType((*Header)(nil), "headers.Header")
 }
 
 func init() { proto.RegisterFile("headers.proto", fileDescriptor_9cec2a7af668f07b) }
 
 var fileDescriptor_9cec2a7af668f07b = []byte{
-	// 145 bytes of a gzipped FileDescriptorProto
+	// 146 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x48, 0x4d, 0x4c,
-	0x49, 0x2d, 0x2a, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xd2, 0xe7,
-	0x62, 0xf7, 0x80, 0x08, 0x0a, 0xa9, 0x70, 0xb1, 0x43, 0xe5, 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8,
-	0x8d, 0xb8, 0xf4, 0x0a, 0x92, 0xf4, 0x20, 0xb2, 0x41, 0x30, 0x29, 0x25, 0x03, 0x2e, 0x36, 0x88,
-	0x90, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x88,
-	0x29, 0x24, 0xc2, 0xc5, 0x5a, 0x96, 0x98, 0x53, 0x9a, 0x2a, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x13,
-	0x04, 0xe1, 0x38, 0x49, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72,
-	0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x12, 0x1b,
-	0xd8, 0x1d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x4e, 0xab, 0xdd, 0x98, 0x00, 0x00,
-	0x00,
+	0x49, 0x2d, 0x2a, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0x95, 0x4c, 0xb8,
+	0xd8, 0x3d, 0x20, 0x4c, 0x21, 0x4d, 0x2e, 0x98, 0xa8, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x11,
+	0xbf, 0x1e, 0x4c, 0x13, 0x44, 0x49, 0x10, 0x5c, 0x97, 0x01, 0x17, 0x1b, 0x44, 0x48, 0x48, 0x80,
+	0x8b, 0x39, 0x3b, 0xb5, 0x52, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xc4, 0x14, 0x12, 0xe1,
+	0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x70, 0x9c,
+	0x64, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f,
+	0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x8a, 0xa9, 0x20, 0x29, 0x89,
+	0x0d, 0xec, 0x2a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x8f, 0xd4, 0x36, 0xa6, 0x00,
+	0x00, 0x00,
 }
 
 func (m *Headers) Marshal() (dAtA []byte, err error) {

pkg/p2p/libp2p/internal/headers/pb/headers.proto

@@ -4,7 +4,9 @@
 
 syntax = "proto3";
 
-package pb;
+package headers;
+
+option go_package = "pb";
 
 message Headers {
     repeated Header headers = 1;

pkg/p2p/protobuf/internal/pb/test.pb.go

@@ -67,20 +67,20 @@ func (m *Message) GetText() string {
 }
 
 func init() {
-	proto.RegisterType((*Message)(nil), "pb.Message")
+	proto.RegisterType((*Message)(nil), "test.Message")
 }
 
 func init() { proto.RegisterFile("test.proto", fileDescriptor_c161fcfdc0c3ff1e) }
 
 var fileDescriptor_c161fcfdc0c3ff1e = []byte{
-	// 100 bytes of a gzipped FileDescriptorProto
+	// 104 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0x2d, 0x2e,
-	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0x92, 0xe5, 0x62, 0xf7, 0x4d,
-	0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x09, 0x49, 0xad, 0x28, 0x91, 0x60, 0x54,
-	0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x9d, 0x24, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e,
-	0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58,
-	0x8e, 0x21, 0x89, 0x0d, 0x6c, 0x86, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xbb, 0x60, 0xa9,
-	0x51, 0x00, 0x00, 0x00,
+	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0xb1, 0x95, 0x64, 0xb9, 0xd8, 0x7d, 0x53,
+	0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0x84, 0xb8, 0x58, 0x42, 0x52, 0x2b, 0x4a, 0x24, 0x18, 0x15,
+	0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x27, 0x99, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63,
+	0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96,
+	0x63, 0x88, 0x62, 0x2a, 0x48, 0x4a, 0x62, 0x03, 0x9b, 0x64, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
+	0xe2, 0x4b, 0x1d, 0x71, 0x57, 0x00, 0x00, 0x00,
 }
 
 func (m *Message) Marshal() (dAtA []byte, err error) {

pkg/p2p/protobuf/internal/pb/test.proto

@@ -4,7 +4,9 @@
 
 syntax = "proto3";
 
-package pb;
+package test;
+
+option go_package = "pb";
 
 message Message {
     string Text = 1;

pkg/pingpong/pb/pingpong.pb.go

@@ -111,22 +111,22 @@ func (m *Pong) GetResponse() string {
 }
 
 func init() {
-	proto.RegisterType((*Ping)(nil), "pb.Ping")
-	proto.RegisterType((*Pong)(nil), "pb.Pong")
+	proto.RegisterType((*Ping)(nil), "pingpong.Ping")
+	proto.RegisterType((*Pong)(nil), "pingpong.Pong")
 }
 
 func init() { proto.RegisterFile("pingpong.proto", fileDescriptor_1cfbf639ab46154b) }
 
 var fileDescriptor_1cfbf639ab46154b = []byte{
-	// 122 bytes of a gzipped FileDescriptorProto
+	// 126 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2b, 0xc8, 0xcc, 0x4b,
-	0x2f, 0xc8, 0xcf, 0x4b, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0x52,
-	0xe2, 0x62, 0x09, 0xc8, 0xcc, 0x4b, 0x17, 0x92, 0xe2, 0xe2, 0x70, 0x2f, 0x4a, 0x4d, 0x2d, 0xc9,
-	0xcc, 0x4b, 0x97, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0xf3, 0xc1, 0x6a, 0xf2, 0x21, 0x6a,
-	0x82, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x61, 0x6a, 0x60, 0x7c, 0x27, 0x89, 0x13, 0x8f,
-	0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b,
-	0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x48, 0x62, 0x03, 0x5b, 0x66, 0x0c, 0x08, 0x00, 0x00,
-	0xff, 0xff, 0x8c, 0xe4, 0x0f, 0x96, 0x7e, 0x00, 0x00, 0x00,
+	0x2f, 0xc8, 0xcf, 0x4b, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0x95, 0x94,
+	0xb8, 0x58, 0x02, 0x32, 0xf3, 0xd2, 0x85, 0xa4, 0xb8, 0x38, 0xdc, 0x8b, 0x52, 0x53, 0x4b, 0x32,
+	0xf3, 0xd2, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xe0, 0x7c, 0xb0, 0x9a, 0x7c, 0x88, 0x9a,
+	0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x98, 0x1a, 0x18, 0xdf, 0x49, 0xe6, 0xc4, 0x23,
+	0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2,
+	0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x98, 0x0a, 0x92, 0x92, 0xd8, 0xc0, 0xd6, 0x1a,
+	0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x08, 0xee, 0x5c, 0x58, 0x88, 0x00, 0x00, 0x00,
 }
 
 func (m *Ping) Marshal() (dAtA []byte, err error) {

pkg/pingpong/pb/pingpong.proto

@@ -4,7 +4,9 @@
 
 syntax = "proto3";
 
-package pb;
+package pingpong;
+
+option go_package = "pb";
 
 message Ping {
     string Greeting = 1;

pkg/pushsync/pb/pushsync.pb.go

@@ -119,23 +119,23 @@ func (m *Receipt) GetAddress() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Delivery)(nil), "pb.Delivery")
-	proto.RegisterType((*Receipt)(nil), "pb.Receipt")
+	proto.RegisterType((*Delivery)(nil), "pushsync.Delivery")
+	proto.RegisterType((*Receipt)(nil), "pushsync.Receipt")
 }
 
 func init() { proto.RegisterFile("pushsync.proto", fileDescriptor_723cf31bfc02bfd6) }
 
 var fileDescriptor_723cf31bfc02bfd6 = []byte{
-	// 135 bytes of a gzipped FileDescriptorProto
+	// 139 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2b, 0x28, 0x2d, 0xce,
-	0x28, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xb2,
-	0xe0, 0xe2, 0x70, 0x49, 0xcd, 0xc9, 0x2c, 0x4b, 0x2d, 0xaa, 0x14, 0x92, 0xe0, 0x62, 0x77, 0x4c,
-	0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0x84,
-	0xb8, 0x58, 0x5c, 0x12, 0x4b, 0x12, 0x25, 0x98, 0xc0, 0xc2, 0x60, 0xb6, 0x92, 0x32, 0x17, 0x7b,
-	0x50, 0x6a, 0x72, 0x6a, 0x66, 0x41, 0x09, 0x6e, 0x8d, 0x4e, 0x12, 0x27, 0x1e, 0xc9, 0x31, 0x5e,
-	0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31,
-	0xdc, 0x78, 0x2c, 0xc7, 0x90, 0xc4, 0x06, 0x76, 0x83, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9d,
-	0x84, 0x4d, 0xb6, 0x95, 0x00, 0x00, 0x00,
+	0x28, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0x95, 0x2c,
+	0xb8, 0x38, 0x5c, 0x52, 0x73, 0x32, 0xcb, 0x52, 0x8b, 0x2a, 0x85, 0x24, 0xb8, 0xd8, 0x1d, 0x53,
+	0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0x60, 0x5c, 0x21, 0x21,
+	0x2e, 0x16, 0x97, 0xc4, 0x92, 0x44, 0x09, 0x26, 0xb0, 0x30, 0x98, 0xad, 0xa4, 0xcc, 0xc5, 0x1e,
+	0x94, 0x9a, 0x9c, 0x9a, 0x59, 0x50, 0x82, 0x5b, 0xa3, 0x93, 0xcc, 0x89, 0x47, 0x72, 0x8c, 0x17,
+	0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c,
+	0x37, 0x1e, 0xcb, 0x31, 0x44, 0x31, 0x15, 0x24, 0x25, 0xb1, 0x81, 0x5d, 0x63, 0x0c, 0x08, 0x00,
+	0x00, 0xff, 0xff, 0x1b, 0x63, 0x50, 0x4a, 0x9f, 0x00, 0x00, 0x00,
 }
 
 func (m *Delivery) Marshal() (dAtA []byte, err error) {

pkg/pushsync/pb/pushsync.proto

@@ -4,7 +4,9 @@
 
 syntax = "proto3";
 
-package pb;
+package pushsync;
+
+option go_package = "pb";
 
 message Delivery {
   bytes Address = 1;

pkg/retrieval/pb/retrieval.pb.go

@@ -111,22 +111,23 @@ func (m *Delivery) GetData() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Request)(nil), "pb.Request")
-	proto.RegisterType((*Delivery)(nil), "pb.Delivery")
+	proto.RegisterType((*Request)(nil), "retieval.Request")
+	proto.RegisterType((*Delivery)(nil), "retieval.Delivery")
 }
 
 func init() { proto.RegisterFile("retrieval.proto", fileDescriptor_fcade0a564e5dcd4) }
 
 var fileDescriptor_fcade0a564e5dcd4 = []byte{
-	// 127 bytes of a gzipped FileDescriptorProto
+	// 134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0x4a, 0x2d, 0x29,
-	0xca, 0x4c, 0x2d, 0x4b, 0xcc, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52,
-	0x92, 0xe5, 0x62, 0x0f, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x12, 0xe2, 0x62, 0x71, 0x4c,
-	0x49, 0x29, 0x92, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x02, 0xb3, 0x95, 0xe4, 0xb8, 0x38, 0x5c,
-	0x52, 0x73, 0x32, 0xcb, 0x52, 0x8b, 0x2a, 0x41, 0xf2, 0x2e, 0x89, 0x25, 0x89, 0x30, 0x79, 0x10,
-	0xdb, 0x49, 0xe2, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c,
-	0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x92, 0xd8, 0xc0, 0x76,
-	0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xfc, 0x90, 0x25, 0x76, 0x00, 0x00, 0x00,
+	0xca, 0x4c, 0x2d, 0x4b, 0xcc, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x28, 0x4a, 0x2d,
+	0x01, 0xf3, 0x95, 0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x84, 0xb8,
+	0x58, 0x1c, 0x53, 0x52, 0x8a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0xc0, 0x6c, 0x25, 0x39,
+	0x2e, 0x0e, 0x97, 0xd4, 0x9c, 0xcc, 0xb2, 0xd4, 0xa2, 0x4a, 0x90, 0xbc, 0x4b, 0x62, 0x49, 0x22,
+	0x4c, 0x1e, 0xc4, 0x76, 0x92, 0x39, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f,
+	0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28,
+	0xa6, 0x82, 0xa4, 0x24, 0x36, 0xb0, 0x6d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x88,
+	0xb0, 0x44, 0x80, 0x00, 0x00, 0x00,
 }
 
 func (m *Request) Marshal() (dAtA []byte, err error) {

pkg/retrieval/pb/retrieval.proto

@@ -4,7 +4,9 @@
 
 syntax = "proto3";
 
-package pb;
+package retieval;
+
+option go_package = "pb";
 
 message Request {
     bytes Addr = 1;