diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index ef2f0f200..c7b2a9baf 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -14,6 +14,11 @@ "Comment": "null-5", "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" }, + { + "ImportPath": "code.google.com/p/goprotobuf/proto", + "Comment": "go.r60-152", + "Rev": "36be16571e14f67e114bb0af619e5de2c1591679" + }, { "ImportPath": "github.com/ActiveState/tail", "Rev": "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a" diff --git a/core/commands/internal/incfusever/doc.go b/core/commands/incfusever/doc.go similarity index 100% rename from core/commands/internal/incfusever/doc.go rename to core/commands/incfusever/doc.go diff --git a/core/commands/internal/incfusever/incfusever.go b/core/commands/incfusever/incfusever.go similarity index 100% rename from core/commands/internal/incfusever/incfusever.go rename to core/commands/incfusever/incfusever.go diff --git a/diagnostics/diag.go b/diagnostics/diag.go index 06f204337..a8136f598 100644 --- a/diagnostics/diag.go +++ b/diagnostics/diag.go @@ -15,7 +15,7 @@ import ( proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" - pb "github.com/ipfs/go-ipfs/diagnostics/internal/pb" + pb "github.com/ipfs/go-ipfs/diagnostics/pb" host "github.com/ipfs/go-ipfs/p2p/host" inet "github.com/ipfs/go-ipfs/p2p/net" peer "github.com/ipfs/go-ipfs/p2p/peer" diff --git a/diagnostics/internal/pb/Makefile b/diagnostics/pb/Makefile similarity index 100% rename from diagnostics/internal/pb/Makefile rename to diagnostics/pb/Makefile diff --git a/diagnostics/internal/pb/diagnostics.pb.go b/diagnostics/pb/diagnostics.pb.go similarity index 100% rename from diagnostics/internal/pb/diagnostics.pb.go rename to diagnostics/pb/diagnostics.pb.go diff --git a/diagnostics/internal/pb/diagnostics.proto b/diagnostics/pb/diagnostics.proto similarity index 100% rename from diagnostics/internal/pb/diagnostics.proto rename to diagnostics/pb/diagnostics.proto diff --git a/diagnostics/internal/pb/timeout.go b/diagnostics/pb/timeout.go similarity index 100% rename from diagnostics/internal/pb/timeout.go rename to diagnostics/pb/timeout.go diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go index 6e4979939..090970bd3 100644 --- a/exchange/bitswap/message/message.go +++ b/exchange/bitswap/message/message.go @@ -5,7 +5,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" key "github.com/ipfs/go-ipfs/blocks/key" - pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb" + pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb" wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" inet "github.com/ipfs/go-ipfs/p2p/net" diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go index 4452b88a0..70d966e0a 100644 --- a/exchange/bitswap/message/message_test.go +++ b/exchange/bitswap/message/message_test.go @@ -8,7 +8,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" key "github.com/ipfs/go-ipfs/blocks/key" - pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb" + pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb" ) func TestAppendWanted(t *testing.T) { diff --git a/exchange/bitswap/message/internal/pb/Makefile b/exchange/bitswap/message/pb/Makefile similarity index 100% rename from exchange/bitswap/message/internal/pb/Makefile rename to exchange/bitswap/message/pb/Makefile diff --git a/exchange/bitswap/message/internal/pb/message.pb.go b/exchange/bitswap/message/pb/message.pb.go similarity index 100% rename from exchange/bitswap/message/internal/pb/message.pb.go rename to exchange/bitswap/message/pb/message.pb.go diff --git a/exchange/bitswap/message/internal/pb/message.proto b/exchange/bitswap/message/pb/message.proto similarity index 100% rename from exchange/bitswap/message/internal/pb/message.proto rename to exchange/bitswap/message/pb/message.proto diff --git a/merkledag/coding.go b/merkledag/coding.go index 6e108c2cf..f8cc326a4 100644 --- a/merkledag/coding.go +++ b/merkledag/coding.go @@ -6,7 +6,7 @@ import ( mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" - pb "github.com/ipfs/go-ipfs/merkledag/internal/pb" + pb "github.com/ipfs/go-ipfs/merkledag/pb" u "github.com/ipfs/go-ipfs/util" ) diff --git a/merkledag/internal/pb/Makefile b/merkledag/pb/Makefile similarity index 100% rename from merkledag/internal/pb/Makefile rename to merkledag/pb/Makefile diff --git a/merkledag/internal/pb/merkledag.pb.go b/merkledag/pb/merkledag.pb.go similarity index 100% rename from merkledag/internal/pb/merkledag.pb.go rename to merkledag/pb/merkledag.pb.go diff --git a/merkledag/internal/pb/merkledag.proto b/merkledag/pb/merkledag.proto similarity index 100% rename from merkledag/internal/pb/merkledag.proto rename to merkledag/pb/merkledag.proto diff --git a/merkledag/internal/pb/merkledagpb_test.go b/merkledag/pb/merkledagpb_test.go similarity index 100% rename from merkledag/internal/pb/merkledagpb_test.go rename to merkledag/pb/merkledagpb_test.go diff --git a/namesys/internal/pb/Makefile b/namesys/pb/Makefile similarity index 100% rename from namesys/internal/pb/Makefile rename to namesys/pb/Makefile diff --git a/namesys/internal/pb/namesys.pb.go b/namesys/pb/namesys.pb.go similarity index 100% rename from namesys/internal/pb/namesys.pb.go rename to namesys/pb/namesys.pb.go diff --git a/namesys/internal/pb/namesys.proto b/namesys/pb/namesys.proto similarity index 100% rename from namesys/internal/pb/namesys.proto rename to namesys/pb/namesys.proto diff --git a/namesys/publisher.go b/namesys/publisher.go index f20009b7d..3f5e15ae5 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -11,7 +11,7 @@ import ( key "github.com/ipfs/go-ipfs/blocks/key" dag "github.com/ipfs/go-ipfs/merkledag" - pb "github.com/ipfs/go-ipfs/namesys/internal/pb" + pb "github.com/ipfs/go-ipfs/namesys/pb" ci "github.com/ipfs/go-ipfs/p2p/crypto" path "github.com/ipfs/go-ipfs/path" pin "github.com/ipfs/go-ipfs/pin" diff --git a/namesys/routing.go b/namesys/routing.go index 40acf38bd..9ff2a62f6 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" key "github.com/ipfs/go-ipfs/blocks/key" - pb "github.com/ipfs/go-ipfs/namesys/internal/pb" + pb "github.com/ipfs/go-ipfs/namesys/pb" path "github.com/ipfs/go-ipfs/path" routing "github.com/ipfs/go-ipfs/routing" u "github.com/ipfs/go-ipfs/util" diff --git a/p2p/crypto/key.go b/p2p/crypto/key.go index c483e4f87..37f330b1b 100644 --- a/p2p/crypto/key.go +++ b/p2p/crypto/key.go @@ -21,7 +21,7 @@ import ( proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" - pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb" + pb "github.com/ipfs/go-ipfs/p2p/crypto/pb" u "github.com/ipfs/go-ipfs/util" ) diff --git a/p2p/crypto/secio/internal/pb/Makefile b/p2p/crypto/pb/Makefile similarity index 52% rename from p2p/crypto/secio/internal/pb/Makefile rename to p2p/crypto/pb/Makefile index 334feee74..0b987a38e 100644 --- a/p2p/crypto/secio/internal/pb/Makefile +++ b/p2p/crypto/pb/Makefile @@ -4,7 +4,7 @@ GO = $(PB:.proto=.pb.go) all: $(GO) %.pb.go: %.proto - protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $< + protoc --go_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $< clean: rm *.pb.go diff --git a/p2p/crypto/internal/pb/crypto.pb.go b/p2p/crypto/pb/crypto.pb.go similarity index 97% rename from p2p/crypto/internal/pb/crypto.pb.go rename to p2p/crypto/pb/crypto.pb.go index 026475d4a..08425452b 100644 --- a/p2p/crypto/internal/pb/crypto.pb.go +++ b/p2p/crypto/pb/crypto.pb.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-go. // source: crypto.proto // DO NOT EDIT! @@ -14,7 +14,7 @@ It has these top-level messages: */ package crypto_pb -import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" +import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/golang/protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/p2p/crypto/internal/pb/crypto.proto b/p2p/crypto/pb/crypto.proto similarity index 100% rename from p2p/crypto/internal/pb/crypto.proto rename to p2p/crypto/pb/crypto.proto diff --git a/p2p/crypto/rsa.go b/p2p/crypto/rsa.go index c0407e1ab..a730f02f5 100644 --- a/p2p/crypto/rsa.go +++ b/p2p/crypto/rsa.go @@ -10,7 +10,7 @@ import ( proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" - pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb" + pb "github.com/ipfs/go-ipfs/p2p/crypto/pb" ) type RsaPrivateKey struct { diff --git a/p2p/crypto/internal/pb/Makefile b/p2p/crypto/secio/pb/Makefile similarity index 100% rename from p2p/crypto/internal/pb/Makefile rename to p2p/crypto/secio/pb/Makefile diff --git a/p2p/crypto/secio/internal/pb/spipe.pb.go b/p2p/crypto/secio/pb/spipe.pb.go similarity index 100% rename from p2p/crypto/secio/internal/pb/spipe.pb.go rename to p2p/crypto/secio/pb/spipe.pb.go diff --git a/p2p/crypto/secio/internal/pb/spipe.proto b/p2p/crypto/secio/pb/spipe.proto similarity index 100% rename from p2p/crypto/secio/internal/pb/spipe.proto rename to p2p/crypto/secio/pb/spipe.proto diff --git a/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go index b51197202..beb13d002 100644 --- a/p2p/crypto/secio/protocol.go +++ b/p2p/crypto/secio/protocol.go @@ -12,7 +12,7 @@ import ( msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ci "github.com/ipfs/go-ipfs/p2p/crypto" - pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/internal/pb" + pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/pb" peer "github.com/ipfs/go-ipfs/p2p/peer" eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog" u "github.com/ipfs/go-ipfs/util"