@cryptotaxi247 / kubo / commits / 6e9c72ab3

expose internal/pb packages.

we shouldn't use internal packages. License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>

Juan Batiz-Benet committed Jul 9, 2015 at 16:34 UTC 6e9c72ab3705fc38316c4c676498aa73b5366335
32 files changed +17 -12
Godeps/Godeps.json
+5
@@ -14,6 +14,11 @@
14 "Comment": "null-5",
15 "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
16 },
17 + {
18 + "ImportPath": "code.google.com/p/goprotobuf/proto",
19 + "Comment": "go.r60-152",
20 + "Rev": "36be16571e14f67e114bb0af619e5de2c1591679"
21 + },
22 {
23 "ImportPath": "github.com/ActiveState/tail",
24 "Rev": "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a"
core/commands/incfusever/doc.go renamed
core/commands/incfusever/incfusever.go renamed
diagnostics/diag.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
16 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17
18 - pb "github.com/ipfs/go-ipfs/diagnostics/internal/pb"
18 + pb "github.com/ipfs/go-ipfs/diagnostics/pb"
19 host "github.com/ipfs/go-ipfs/p2p/host"
20 inet "github.com/ipfs/go-ipfs/p2p/net"
21 peer "github.com/ipfs/go-ipfs/p2p/peer"
diagnostics/pb/Makefile renamed
diagnostics/pb/diagnostics.pb.go renamed
diagnostics/pb/diagnostics.proto renamed
diagnostics/pb/timeout.go renamed
exchange/bitswap/message/message.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 blocks "github.com/ipfs/go-ipfs/blocks"
7 key "github.com/ipfs/go-ipfs/blocks/key"
8 - pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
8 + pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
9 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
10 inet "github.com/ipfs/go-ipfs/p2p/net"
11
exchange/bitswap/message/message_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 - pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
11 + pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
12 )
13
14 func TestAppendWanted(t *testing.T) {
exchange/bitswap/message/pb/Makefile renamed
exchange/bitswap/message/pb/message.pb.go renamed
exchange/bitswap/message/pb/message.proto renamed
merkledag/coding.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
8
9 - pb "github.com/ipfs/go-ipfs/merkledag/internal/pb"
9 + pb "github.com/ipfs/go-ipfs/merkledag/pb"
10 u "github.com/ipfs/go-ipfs/util"
11 )
12
merkledag/pb/Makefile renamed
merkledag/pb/merkledag.pb.go renamed
merkledag/pb/merkledag.proto renamed
merkledag/pb/merkledagpb_test.go renamed
namesys/pb/Makefile renamed
namesys/pb/namesys.pb.go renamed
namesys/pb/namesys.proto renamed
namesys/publisher.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 key "github.com/ipfs/go-ipfs/blocks/key"
13 dag "github.com/ipfs/go-ipfs/merkledag"
14 - pb "github.com/ipfs/go-ipfs/namesys/internal/pb"
14 + pb "github.com/ipfs/go-ipfs/namesys/pb"
15 ci "github.com/ipfs/go-ipfs/p2p/crypto"
16 path "github.com/ipfs/go-ipfs/path"
17 pin "github.com/ipfs/go-ipfs/pin"
namesys/routing.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 - pb "github.com/ipfs/go-ipfs/namesys/internal/pb"
11 + pb "github.com/ipfs/go-ipfs/namesys/pb"
12 path "github.com/ipfs/go-ipfs/path"
13 routing "github.com/ipfs/go-ipfs/routing"
14 u "github.com/ipfs/go-ipfs/util"
p2p/crypto/key.go
+1 -1
@@ -21,7 +21,7 @@ import (
21
22 proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
23
24 - pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
24 + pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
25 u "github.com/ipfs/go-ipfs/util"
26 )
27
p2p/crypto/pb/Makefile renamed
+1 -1
@@ -4,7 +4,7 @@ GO = $(PB:.proto=.pb.go)
4 all: $(GO)
5
6 %.pb.go: %.proto
7 - protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
7 + protoc --go_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
8
9 clean:
10 rm *.pb.go
p2p/crypto/pb/crypto.pb.go renamed
+2 -2
@@ -1,4 +1,4 @@
1 -// Code generated by protoc-gen-gogo.
1 +// Code generated by protoc-gen-go.
2 // source: crypto.proto
3 // DO NOT EDIT!
4
@@ -14,7 +14,7 @@ It has these top-level messages:
14 */
15 package crypto_pb
16
17 -import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
17 +import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/golang/protobuf/proto"
18 import math "math"
19
20 // Reference imports to suppress errors if they are not otherwise used.
p2p/crypto/pb/crypto.proto renamed
p2p/crypto/rsa.go
+1 -1
@@ -10,7 +10,7 @@ import (
10
11 proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
12
13 - pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
13 + pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
14 )
15
16 type RsaPrivateKey struct {
p2p/crypto/secio/pb/Makefile renamed
p2p/crypto/secio/pb/spipe.pb.go renamed
p2p/crypto/secio/pb/spipe.proto renamed
p2p/crypto/secio/protocol.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
13 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14 ci "github.com/ipfs/go-ipfs/p2p/crypto"
15 - pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/internal/pb"
15 + pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/pb"
16 peer "github.com/ipfs/go-ipfs/p2p/peer"
17 eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
18 u "github.com/ipfs/go-ipfs/util"