crypto -> p2p/crypto
The crypto package moves into p2p. Nothing in it so far is ipfs specific; everything is p2p-general.
Juan Batiz-Benet committed
Dec 29, 2014 at 05:45 UTC
cc0d7c9b579085d14f207ac6aed6e81d19f44707
47 files changed
+40
-40
cmd/ipfs/init.go
+1
-1
@@ -12,9 +12,9 @@ import (
12
cmds "github.com/jbenet/go-ipfs/commands"
13
config "github.com/jbenet/go-ipfs/config"
14
core "github.com/jbenet/go-ipfs/core"
15
- ci "github.com/jbenet/go-ipfs/crypto"
15
imp "github.com/jbenet/go-ipfs/importer"
16
chunk "github.com/jbenet/go-ipfs/importer/chunk"
17
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
18
peer "github.com/jbenet/go-ipfs/p2p/peer"
19
repo "github.com/jbenet/go-ipfs/repo"
20
u "github.com/jbenet/go-ipfs/util"
cmd/seccat/seccat.go
+2
-2
@@ -18,8 +18,8 @@ import (
18
"os/signal"
19
"syscall"
20
21
- ci "github.com/jbenet/go-ipfs/crypto"
22
- secio "github.com/jbenet/go-ipfs/crypto/secio"
21
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
22
+ secio "github.com/jbenet/go-ipfs/p2p/crypto/secio"
23
peer "github.com/jbenet/go-ipfs/p2p/peer"
24
u "github.com/jbenet/go-ipfs/util"
25
)
config/config.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"os"
7
"path/filepath"
8
9
- ic "github.com/jbenet/go-ipfs/crypto"
9
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
10
u "github.com/jbenet/go-ipfs/util"
11
"github.com/jbenet/go-ipfs/util/debugerror"
12
)
core/commands/id.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
12
13
cmds "github.com/jbenet/go-ipfs/commands"
14
- ic "github.com/jbenet/go-ipfs/crypto"
14
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
15
"github.com/jbenet/go-ipfs/p2p/peer"
16
kb "github.com/jbenet/go-ipfs/routing/kbucket"
17
u "github.com/jbenet/go-ipfs/util"
core/commands/publish.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
7
cmds "github.com/jbenet/go-ipfs/commands"
8
core "github.com/jbenet/go-ipfs/core"
9
- crypto "github.com/jbenet/go-ipfs/crypto"
9
nsys "github.com/jbenet/go-ipfs/namesys"
10
+ crypto "github.com/jbenet/go-ipfs/p2p/crypto"
11
u "github.com/jbenet/go-ipfs/util"
12
)
13
core/core.go
+1
-1
@@ -11,7 +11,6 @@ import (
11
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
12
bserv "github.com/jbenet/go-ipfs/blockservice"
13
config "github.com/jbenet/go-ipfs/config"
14
- ic "github.com/jbenet/go-ipfs/crypto"
14
diag "github.com/jbenet/go-ipfs/diagnostics"
15
exchange "github.com/jbenet/go-ipfs/exchange"
16
bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
@@ -22,6 +21,7 @@ import (
21
namesys "github.com/jbenet/go-ipfs/namesys"
22
inet "github.com/jbenet/go-ipfs/net"
23
swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
24
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
25
peer "github.com/jbenet/go-ipfs/p2p/peer"
26
path "github.com/jbenet/go-ipfs/path"
27
pin "github.com/jbenet/go-ipfs/pin"
core/mock.go
+1
-1
@@ -7,11 +7,11 @@ import (
7
syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
8
"github.com/jbenet/go-ipfs/blocks/blockstore"
9
blockservice "github.com/jbenet/go-ipfs/blockservice"
10
- ci "github.com/jbenet/go-ipfs/crypto"
10
"github.com/jbenet/go-ipfs/exchange/offline"
11
mdag "github.com/jbenet/go-ipfs/merkledag"
12
nsys "github.com/jbenet/go-ipfs/namesys"
13
"github.com/jbenet/go-ipfs/net/mock"
14
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
path "github.com/jbenet/go-ipfs/path"
17
dht "github.com/jbenet/go-ipfs/routing/dht"
fuse/ipns/ipns_unix.go
+1
-1
@@ -14,9 +14,9 @@ import (
14
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
15
16
core "github.com/jbenet/go-ipfs/core"
17
- ci "github.com/jbenet/go-ipfs/crypto"
17
chunk "github.com/jbenet/go-ipfs/importer/chunk"
18
mdag "github.com/jbenet/go-ipfs/merkledag"
19
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
20
ft "github.com/jbenet/go-ipfs/unixfs"
21
uio "github.com/jbenet/go-ipfs/unixfs/io"
22
ftpb "github.com/jbenet/go-ipfs/unixfs/pb"
namesys/interface.go
+1
-1
@@ -3,7 +3,7 @@ package namesys
3
import (
4
"errors"
5
6
- ci "github.com/jbenet/go-ipfs/crypto"
6
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
7
)
8
9
// ErrResolveFailed signals an error when attempting to resolve.
namesys/namesys.go
+1
-1
@@ -1,7 +1,7 @@
1
package namesys
2
3
import (
4
- ci "github.com/jbenet/go-ipfs/crypto"
4
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
5
routing "github.com/jbenet/go-ipfs/routing"
6
)
7
namesys/publisher.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
11
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
12
13
- ci "github.com/jbenet/go-ipfs/crypto"
13
pb "github.com/jbenet/go-ipfs/namesys/internal/pb"
14
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
15
routing "github.com/jbenet/go-ipfs/routing"
16
u "github.com/jbenet/go-ipfs/util"
17
)
namesys/routing.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
8
9
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10
- ci "github.com/jbenet/go-ipfs/crypto"
10
pb "github.com/jbenet/go-ipfs/namesys/internal/pb"
11
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
12
routing "github.com/jbenet/go-ipfs/routing"
13
u "github.com/jbenet/go-ipfs/util"
14
)
net/conn/conn.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
13
14
- ic "github.com/jbenet/go-ipfs/crypto"
14
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
u "github.com/jbenet/go-ipfs/util"
17
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
net/conn/interface.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"net"
6
"time"
7
8
- ic "github.com/jbenet/go-ipfs/crypto"
8
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
u "github.com/jbenet/go-ipfs/util"
11
net/conn/listen.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
10
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
11
12
- ic "github.com/jbenet/go-ipfs/crypto"
12
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
)
15
net/conn/secure_conn.go
+2
-2
@@ -8,8 +8,8 @@ import (
8
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
10
11
- ic "github.com/jbenet/go-ipfs/crypto"
12
- secio "github.com/jbenet/go-ipfs/crypto/secio"
11
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
12
+ secio "github.com/jbenet/go-ipfs/p2p/crypto/secio"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
errors "github.com/jbenet/go-ipfs/util/debugerror"
15
)
net/conn/secure_conn_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"testing"
9
"time"
10
11
- ic "github.com/jbenet/go-ipfs/crypto"
11
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
12
13
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
)
net/mock/interface.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"io"
11
"time"
12
13
- ic "github.com/jbenet/go-ipfs/crypto"
13
inet "github.com/jbenet/go-ipfs/net"
14
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
17
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
net/mock/mock_conn.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"container/list"
5
"sync"
6
7
- ic "github.com/jbenet/go-ipfs/crypto"
7
inet "github.com/jbenet/go-ipfs/net"
8
mux "github.com/jbenet/go-ipfs/net/services/mux"
9
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
net/mock/mock_net.go
+1
-1
@@ -4,8 +4,8 @@ import (
4
"fmt"
5
"sync"
6
7
- ic "github.com/jbenet/go-ipfs/crypto"
7
inet "github.com/jbenet/go-ipfs/net"
8
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
testutil "github.com/jbenet/go-ipfs/util/testutil"
11
net/mock/mock_peernet.go
+1
-1
@@ -5,11 +5,11 @@ import (
5
"math/rand"
6
"sync"
7
8
- ic "github.com/jbenet/go-ipfs/crypto"
8
inet "github.com/jbenet/go-ipfs/net"
9
ids "github.com/jbenet/go-ipfs/net/services/identify"
10
mux "github.com/jbenet/go-ipfs/net/services/mux"
11
relay "github.com/jbenet/go-ipfs/net/services/relay"
12
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
15
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/swarm/swarm_conn.go
+1
-1
@@ -3,8 +3,8 @@ package swarm
3
import (
4
"fmt"
5
6
- ic "github.com/jbenet/go-ipfs/crypto"
6
conn "github.com/jbenet/go-ipfs/net/conn"
7
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/swarmnet/net.go
+1
-1
@@ -4,7 +4,7 @@ package net
4
import (
5
"fmt"
6
7
- ic "github.com/jbenet/go-ipfs/crypto"
7
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10
inet "github.com/jbenet/go-ipfs/net"
p2p/crypto/internal/pb/Makefile
renamed
p2p/crypto/internal/pb/crypto.pb.go
renamed
p2p/crypto/internal/pb/crypto.proto
renamed
p2p/crypto/key.go
renamed
+1
-1
@@ -21,7 +21,7 @@ import (
21
22
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
23
24
- pb "github.com/jbenet/go-ipfs/crypto/internal/pb"
24
+ pb "github.com/jbenet/go-ipfs/p2p/crypto/internal/pb"
25
u "github.com/jbenet/go-ipfs/util"
26
)
27
p2p/crypto/key_test.go
renamed
+1
-1
@@ -1,7 +1,7 @@
1
package crypto_test
2
3
import (
4
- . "github.com/jbenet/go-ipfs/crypto"
4
+ . "github.com/jbenet/go-ipfs/p2p/crypto"
5
6
"bytes"
7
tu "github.com/jbenet/go-ipfs/util/testutil"
p2p/crypto/rsa.go
renamed
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
12
13
- pb "github.com/jbenet/go-ipfs/crypto/internal/pb"
13
+ pb "github.com/jbenet/go-ipfs/p2p/crypto/internal/pb"
14
)
15
16
type RsaPrivateKey struct {
p2p/crypto/secio/al.go
renamed
+1
-1
@@ -15,7 +15,7 @@ import (
15
16
bfish "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish"
17
18
- ci "github.com/jbenet/go-ipfs/crypto"
18
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
19
)
20
21
// List of supported ECDH curves
p2p/crypto/secio/interface.go
renamed
+1
-1
@@ -4,7 +4,7 @@ package secio
4
import (
5
"io"
6
7
- ci "github.com/jbenet/go-ipfs/crypto"
7
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
8
9
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
p2p/crypto/secio/internal/pb/Makefile
renamed
p2p/crypto/secio/internal/pb/spipe.pb.go
renamed
p2p/crypto/secio/internal/pb/spipe.proto
renamed
p2p/crypto/secio/io_test.go
renamed
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
renamed
+2
-2
@@ -10,8 +10,8 @@ import (
10
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
12
13
- ci "github.com/jbenet/go-ipfs/crypto"
14
- pb "github.com/jbenet/go-ipfs/crypto/secio/internal/pb"
13
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
14
+ pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
u "github.com/jbenet/go-ipfs/util"
17
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
p2p/crypto/secio/rw.go
renamed
p2p/peer/peer.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
10
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
11
12
- ic "github.com/jbenet/go-ipfs/crypto"
12
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
13
u "github.com/jbenet/go-ipfs/util"
14
)
15
p2p/peer/peer_test.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"strings"
7
"testing"
8
9
- ic "github.com/jbenet/go-ipfs/crypto"
10
- . "github.com/jbenet/go-ipfs/peer"
9
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
10
+ . "github.com/jbenet/go-ipfs/p2p/peer"
11
u "github.com/jbenet/go-ipfs/util"
12
tu "github.com/jbenet/go-ipfs/util/testutil"
13
p2p/peer/peerstore.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"sync"
6
7
- ic "github.com/jbenet/go-ipfs/crypto"
7
+ ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
9
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
10
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
routing/dht/records.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
11
12
- ci "github.com/jbenet/go-ipfs/crypto"
12
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
13
"github.com/jbenet/go-ipfs/p2p/peer"
14
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
15
u "github.com/jbenet/go-ipfs/util"
routing/kbucket/sorting.go
+1
-1
@@ -2,7 +2,7 @@ package kbucket
2
3
import (
4
"container/list"
5
- peer "github.com/jbenet/go-ipfs/peer"
5
+ peer "github.com/jbenet/go-ipfs/p2p/peer"
6
"sort"
7
)
8
util/testutil/gen.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"sync"
10
"testing"
11
12
- ci "github.com/jbenet/go-ipfs/crypto"
12
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
u "github.com/jbenet/go-ipfs/util"
15
util/testutil/identity.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
6
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
7
- ci "github.com/jbenet/go-ipfs/crypto"
7
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
)
10