Cleanup protobuf for use with protobufserialization

ipfs/protobuf/message.proto

@@ -2,25 +2,23 @@ syntax = "proto3";
 
 package bitswap.message.pb;
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-
 message Message {
 
   message Wantlist {
     enum WantType {
-      Block = 0;
-      Have = 1;
+      wantBlock = 0;
+      wantHave = 1;
     }
 
     message Entry {
-			bytes block = 1 [(gogoproto.customtype) = "Cid", (gogoproto.nullable) = false];		// the block cid (cidV0 in bitswap 1.0.0, cidV1 in bitswap 1.1.0)
+			bytes block = 1;		// the block cid (cidV0 in bitswap 1.0.0, cidV1 in bitswap 1.1.0)
 			int32 priority = 2;	// the priority (normalized). default to 1
 			bool cancel = 3;		// whether this revokes an entry
       WantType wantType = 4; // Note: defaults to enum 0, ie Block
       bool sendDontHave = 5; // Note: defaults to false
 		}
 
-    repeated Entry entries = 1 [(gogoproto.nullable) = false];	// a list of wantlist entries
+    repeated Entry entries = 1;	// a list of wantlist entries
     bool full = 2;							// whether this is the full wantlist. default to false
   }
 
@@ -30,17 +28,17 @@ message Message {
   }
 
   enum BlockPresenceType {
-    Have = 0;
-    DontHave = 1;
+    presenceHave = 0;
+    presenceDontHave = 1;
   }
   message BlockPresence {
-    bytes cid = 1 [(gogoproto.customtype) = "Cid", (gogoproto.nullable) = false];
+    bytes cid = 1;
     BlockPresenceType type = 2;
   }
 
-  Wantlist wantlist = 1 [(gogoproto.nullable) = false];
+  Wantlist wantlist = 1;
   repeated bytes blocks = 2;		// used to send Blocks in bitswap 1.0.0
-  repeated Block payload = 3 [(gogoproto.nullable) = false];		// used to send Blocks in bitswap 1.1.0
-  repeated BlockPresence blockPresences = 4 [(gogoproto.nullable) = false];
+  repeated Block payload = 3;		// used to send Blocks in bitswap 1.1.0
+  repeated BlockPresence blockPresences = 4;
   int32 pendingBytes = 5;
 }