@cryptotaxi247 / kubo / commits / 0172e4f2b

style(testutil) rename testutil.Peer -> testutil.Identity

cc @jbenet

Brian Tiger Chow committed Dec 24, 2014 at 09:53 UTC 0172e4f2bb37372c6d02f77dd4c53f0608160e90
13 files changed +36 -36
exchange/bitswap/bitswap_test.go
+1 -1
@@ -61,7 +61,7 @@ func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
61 defer g.Close()
62
63 block := blocks.NewBlock([]byte("block"))
64 - pinfo := testutil.RandPeerOrFatal(t)
64 + pinfo := testutil.RandIdentityOrFatal(t)
65 rs.Client(pinfo).Provide(context.Background(), block.Key()) // but not on network
66
67 solo := g.Next()
exchange/bitswap/testnet/interface.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 )
8
9 type Network interface {
10 - Adapter(testutil.Peer) bsnet.BitSwapNetwork
10 + Adapter(testutil.Identity) bsnet.BitSwapNetwork
11
12 HasPeer(peer.ID) bool
13 }
exchange/bitswap/testnet/network_test.go
+4 -4
@@ -17,11 +17,11 @@ import (
17 func TestSendRequestToCooperativePeer(t *testing.T) {
18 net := VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0))
19
20 - recipientPeer := testutil.RandPeerOrFatal(t)
20 + recipientPeer := testutil.RandIdentityOrFatal(t)
21
22 t.Log("Get two network adapters")
23
24 - initiator := net.Adapter(testutil.RandPeerOrFatal(t))
24 + initiator := net.Adapter(testutil.RandIdentityOrFatal(t))
25 recipient := net.Adapter(recipientPeer)
26
27 expectedStr := "response from recipient"
@@ -67,8 +67,8 @@ func TestSendRequestToCooperativePeer(t *testing.T) {
67
68 func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
69 net := VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0))
70 - responderPeer := testutil.RandPeerOrFatal(t)
71 - waiter := net.Adapter(testutil.RandPeerOrFatal(t))
70 + responderPeer := testutil.RandIdentityOrFatal(t)
71 + waiter := net.Adapter(testutil.RandIdentityOrFatal(t))
72 responder := net.Adapter(responderPeer)
73
74 var wg sync.WaitGroup
exchange/bitswap/testnet/peernet.go
+1 -1
@@ -19,7 +19,7 @@ func StreamNet(ctx context.Context, net mockpeernet.Mocknet, rs mockrouting.Serv
19 return &peernet{net, rs}, nil
20 }
21
22 -func (pn *peernet) Adapter(p testutil.Peer) bsnet.BitSwapNetwork {
22 +func (pn *peernet) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
23 client, err := pn.Mocknet.AddPeer(p.PrivateKey(), p.Address())
24 if err != nil {
25 panic(err.Error())
exchange/bitswap/testnet/virtual.go
+1 -1
@@ -29,7 +29,7 @@ type network struct {
29 delay delay.D
30 }
31
32 -func (n *network) Adapter(p testutil.Peer) bsnet.BitSwapNetwork {
32 +func (n *network) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
33 client := &networkClient{
34 local: p.ID(),
35 network: n,
exchange/bitswap/testutils.go
+2 -2
@@ -41,7 +41,7 @@ func (g *SessionGenerator) Close() error {
41
42 func (g *SessionGenerator) Next() Instance {
43 g.seq++
44 - p, err := testutil.RandPeer()
44 + p, err := testutil.RandIdentity()
45 if err != nil {
46 panic("FIXME") // TODO change signature
47 }
@@ -78,7 +78,7 @@ func (i *Instance) SetBlockstoreLatency(t time.Duration) time.Duration {
78 // NB: It's easy make mistakes by providing the same peer ID to two different
79 // sessions. To safeguard, use the SessionGenerator to generate sessions. It's
80 // just a much better idea.
81 -func session(ctx context.Context, net tn.Network, p testutil.Peer) Instance {
81 +func session(ctx context.Context, net tn.Network, p testutil.Identity) Instance {
82 bsdelay := delay.Fixed(0)
83 const kWriteCacheElems = 100
84
namesys/resolve_test.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 )
11
12 func TestRoutingResolve(t *testing.T) {
13 - d := mockrouting.NewServer().Client(testutil.RandPeerOrFatal(t))
13 + d := mockrouting.NewServer().Client(testutil.RandIdentityOrFatal(t))
14
15 resolver := NewRoutingResolver(d)
16 publisher := NewRoutingPublisher(d)
routing/mock/centralized_client.go
+1 -1
@@ -17,7 +17,7 @@ var log = u.Logger("mockrouter")
17 type client struct {
18 datastore ds.Datastore
19 server server
20 - peer testutil.Peer
20 + peer testutil.Identity
21 }
22
23 // FIXME(brian): is this method meant to simulate putting a value into the network?
routing/mock/centralized_server.go
+2 -2
@@ -73,11 +73,11 @@ func (rs *s) Providers(k u.Key) []peer.PeerInfo {
73 return ret
74 }
75
76 -func (rs *s) Client(p testutil.Peer) Client {
76 +func (rs *s) Client(p testutil.Identity) Client {
77 return rs.ClientWithDatastore(context.Background(), p, ds.NewMapDatastore())
78 }
79
80 -func (rs *s) ClientWithDatastore(_ context.Context, p testutil.Peer, datastore ds.Datastore) Client {
80 +func (rs *s) ClientWithDatastore(_ context.Context, p testutil.Identity, datastore ds.Datastore) Client {
81 return &client{
82 peer: p,
83 datastore: ds.NewMapDatastore(),
routing/mock/centralized_test.go
+7 -7
@@ -13,7 +13,7 @@ import (
13
14 func TestKeyNotFound(t *testing.T) {
15
16 - var pi = testutil.RandPeerOrFatal(t)
16 + var pi = testutil.RandIdentityOrFatal(t)
17 var key = u.Key("mock key")
18 var ctx = context.Background()
19
@@ -26,7 +26,7 @@ func TestKeyNotFound(t *testing.T) {
26 }
27
28 func TestClientFindProviders(t *testing.T) {
29 - pi := testutil.RandPeerOrFatal(t)
29 + pi := testutil.RandIdentityOrFatal(t)
30 rs := NewServer()
31 client := rs.Client(pi)
32
@@ -57,7 +57,7 @@ func TestClientOverMax(t *testing.T) {
57 k := u.Key("hello")
58 numProvidersForHelloKey := 100
59 for i := 0; i < numProvidersForHelloKey; i++ {
60 - pi := testutil.RandPeerOrFatal(t)
60 + pi := testutil.RandIdentityOrFatal(t)
61 err := rs.Client(pi).Provide(context.Background(), k)
62 if err != nil {
63 t.Fatal(err)
@@ -65,7 +65,7 @@ func TestClientOverMax(t *testing.T) {
65 }
66
67 max := 10
68 - pi := testutil.RandPeerOrFatal(t)
68 + pi := testutil.RandIdentityOrFatal(t)
69 client := rs.Client(pi)
70
71 providersFromClient := client.FindProvidersAsync(context.Background(), k, max)
@@ -100,7 +100,7 @@ func TestCanceledContext(t *testing.T) {
100 default:
101 }
102
103 - pi, err := testutil.RandPeer()
103 + pi, err := testutil.RandIdentity()
104 if err != nil {
105 t.Error(err)
106 }
@@ -112,7 +112,7 @@ func TestCanceledContext(t *testing.T) {
112 }
113 }()
114
115 - local := testutil.RandPeerOrFatal(t)
115 + local := testutil.RandIdentityOrFatal(t)
116 client := rs.Client(local)
117
118 t.Log("warning: max is finite so this test is non-deterministic")
@@ -138,7 +138,7 @@ func TestCanceledContext(t *testing.T) {
138
139 func TestValidAfter(t *testing.T) {
140
141 - pi := testutil.RandPeerOrFatal(t)
141 + pi := testutil.RandIdentityOrFatal(t)
142 var key = u.Key("mock key")
143 var ctx = context.Background()
144 conf := DelayConfig{
routing/mock/dht.go
+2 -2
@@ -19,11 +19,11 @@ func NewDHTNetwork(mn mocknet.Mocknet) Server {
19 }
20 }
21
22 -func (rs *mocknetserver) Client(p testutil.Peer) Client {
22 +func (rs *mocknetserver) Client(p testutil.Identity) Client {
23 return rs.ClientWithDatastore(context.TODO(), p, ds.NewMapDatastore())
24 }
25
26 -func (rs *mocknetserver) ClientWithDatastore(ctx context.Context, p testutil.Peer, ds ds.Datastore) Client {
26 +func (rs *mocknetserver) ClientWithDatastore(ctx context.Context, p testutil.Identity, ds ds.Datastore) Client {
27
28 // FIXME AddPeer doesn't appear to be idempotent
29
routing/mock/interface.go
+2 -2
@@ -16,8 +16,8 @@ import (
16
17 // Server provides mockrouting Clients
18 type Server interface {
19 - Client(p testutil.Peer) Client
20 - ClientWithDatastore(context.Context, testutil.Peer, ds.Datastore) Client
19 + Client(p testutil.Identity) Client
20 + ClientWithDatastore(context.Context, testutil.Identity, ds.Datastore) Client
21 }
22
23 // Client implements IpfsRouting
util/testutil/identity.go renamed
+11 -11
@@ -8,46 +8,46 @@ import (
8 peer "github.com/jbenet/go-ipfs/peer"
9 )
10
11 -type Peer interface {
11 +type Identity interface {
12 Address() ma.Multiaddr
13 ID() peer.ID
14 PrivateKey() ci.PrivKey
15 PublicKey() ci.PubKey
16 }
17
18 -func RandPeer() (Peer, error) {
18 +func RandIdentity() (Identity, error) {
19 p, err := RandPeerNetParams()
20 if err != nil {
21 return nil, err
22 }
23 - return &testpeer{*p}, nil
23 + return &identity{*p}, nil
24 }
25
26 -func RandPeerOrFatal(t *testing.T) Peer {
26 +func RandIdentityOrFatal(t *testing.T) Identity {
27 p, err := RandPeerNetParams()
28 if err != nil {
29 t.Fatal(err)
30 }
31 - return &testpeer{*p}
31 + return &identity{*p}
32 }
33
34 -// peer is a temporary shim to delay binding of PeerNetParams.
35 -type testpeer struct {
34 +// identity is a temporary shim to delay binding of PeerNetParams.
35 +type identity struct {
36 PeerNetParams
37 }
38
39 -func (p *testpeer) ID() peer.ID {
39 +func (p *identity) ID() peer.ID {
40 return p.PeerNetParams.ID
41 }
42
43 -func (p *testpeer) Address() ma.Multiaddr {
43 +func (p *identity) Address() ma.Multiaddr {
44 return p.Addr
45 }
46
47 -func (p *testpeer) PrivateKey() ci.PrivKey {
47 +func (p *identity) PrivateKey() ci.PrivKey {
48 return p.PrivKey
49 }
50
51 -func (p *testpeer) PublicKey() ci.PubKey {
51 +func (p *identity) PublicKey() ci.PubKey {
52 return p.PubKey
53 }