Skip to content

Commit 8331121

Browse files
jbenetjbenet
committedJul 10, 2015
Merge pull request #1463 from ipfs/exposepb
expose internal/pb packages.
·
v0.34.0-rc1floodsub-0
2 parents d51d70a + 6e9c72a commit 8331121

32 files changed

+17
-12
lines changed
 

‎Godeps/Godeps.json

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/commands/internal/incfusever/doc.go ‎core/commands/incfusever/doc.go

File renamed without changes.

‎diagnostics/diag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
1616
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
1717

18-
pb "github.com/ipfs/go-ipfs/diagnostics/internal/pb"
18+
pb "github.com/ipfs/go-ipfs/diagnostics/pb"
1919
host "github.com/ipfs/go-ipfs/p2p/host"
2020
inet "github.com/ipfs/go-ipfs/p2p/net"
2121
peer "github.com/ipfs/go-ipfs/p2p/peer"

‎diagnostics/internal/pb/Makefile ‎diagnostics/pb/Makefile

File renamed without changes.

‎diagnostics/internal/pb/diagnostics.pb.go ‎diagnostics/pb/diagnostics.pb.go

File renamed without changes.

‎diagnostics/internal/pb/diagnostics.proto ‎diagnostics/pb/diagnostics.proto

File renamed without changes.

‎diagnostics/internal/pb/timeout.go ‎diagnostics/pb/timeout.go

File renamed without changes.

‎exchange/bitswap/message/message.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
blocks "github.com/ipfs/go-ipfs/blocks"
77
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"
99
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
1010
inet "github.com/ipfs/go-ipfs/p2p/net"
1111

‎exchange/bitswap/message/message_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
blocks "github.com/ipfs/go-ipfs/blocks"
1010
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"
1212
)
1313

1414
func TestAppendWanted(t *testing.T) {

‎merkledag/coding.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
88

9-
pb "github.com/ipfs/go-ipfs/merkledag/internal/pb"
9+
pb "github.com/ipfs/go-ipfs/merkledag/pb"
1010
u "github.com/ipfs/go-ipfs/util"
1111
)
1212

‎merkledag/internal/pb/Makefile ‎merkledag/pb/Makefile

File renamed without changes.

‎merkledag/internal/pb/merkledag.pb.go ‎merkledag/pb/merkledag.pb.go

File renamed without changes.

‎merkledag/internal/pb/merkledag.proto ‎merkledag/pb/merkledag.proto

File renamed without changes.

‎merkledag/internal/pb/merkledagpb_test.go ‎merkledag/pb/merkledagpb_test.go

File renamed without changes.

‎namesys/internal/pb/Makefile ‎namesys/pb/Makefile

File renamed without changes.

‎namesys/internal/pb/namesys.pb.go ‎namesys/pb/namesys.pb.go

File renamed without changes.

‎namesys/internal/pb/namesys.proto ‎namesys/pb/namesys.proto

File renamed without changes.

‎namesys/publisher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
key "github.com/ipfs/go-ipfs/blocks/key"
1313
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"
1515
ci "github.com/ipfs/go-ipfs/p2p/crypto"
1616
path "github.com/ipfs/go-ipfs/path"
1717
pin "github.com/ipfs/go-ipfs/pin"

‎namesys/routing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
99

1010
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"
1212
path "github.com/ipfs/go-ipfs/path"
1313
routing "github.com/ipfs/go-ipfs/routing"
1414
u "github.com/ipfs/go-ipfs/util"

‎p2p/crypto/key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
2323

24-
pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
24+
pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
2525
u "github.com/ipfs/go-ipfs/util"
2626
)
2727

‎p2p/crypto/secio/internal/pb/Makefile ‎p2p/crypto/pb/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GO = $(PB:.proto=.pb.go)
44
all: $(GO)
55

66
%.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:. $<
88

99
clean:
1010
rm *.pb.go

‎p2p/crypto/internal/pb/crypto.pb.go ‎p2p/crypto/pb/crypto.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎p2p/crypto/internal/pb/crypto.proto ‎p2p/crypto/pb/crypto.proto

File renamed without changes.

‎p2p/crypto/rsa.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
1212

13-
pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
13+
pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
1414
)
1515

1616
type RsaPrivateKey struct {

‎p2p/crypto/internal/pb/Makefile ‎p2p/crypto/secio/pb/Makefile

File renamed without changes.

‎p2p/crypto/secio/internal/pb/spipe.pb.go ‎p2p/crypto/secio/pb/spipe.pb.go

File renamed without changes.

‎p2p/crypto/secio/internal/pb/spipe.proto ‎p2p/crypto/secio/pb/spipe.proto

File renamed without changes.

‎p2p/crypto/secio/protocol.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
1313
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
1414
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"
1616
peer "github.com/ipfs/go-ipfs/p2p/peer"
1717
eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
1818
u "github.com/ipfs/go-ipfs/util"

0 commit comments

Comments
 (0)
Please sign in to comment.