diff options
Diffstat (limited to 'swarm/pss')
-rw-r--r-- | swarm/pss/api.go | 10 | ||||
-rw-r--r-- | swarm/pss/client/client.go | 16 | ||||
-rw-r--r-- | swarm/pss/client/client_test.go | 24 | ||||
-rw-r--r-- | swarm/pss/client/doc.go | 10 | ||||
-rw-r--r-- | swarm/pss/forwarding_test.go | 14 | ||||
-rw-r--r-- | swarm/pss/handshake.go | 14 | ||||
-rw-r--r-- | swarm/pss/handshake_test.go | 2 | ||||
-rw-r--r-- | swarm/pss/keystore.go | 10 | ||||
-rw-r--r-- | swarm/pss/notify/notify.go | 12 | ||||
-rw-r--r-- | swarm/pss/notify/notify_test.go | 22 | ||||
-rw-r--r-- | swarm/pss/ping.go | 6 | ||||
-rw-r--r-- | swarm/pss/protocol.go | 8 | ||||
-rw-r--r-- | swarm/pss/protocol_test.go | 8 | ||||
-rw-r--r-- | swarm/pss/pss.go | 24 | ||||
-rw-r--r-- | swarm/pss/pss_test.go | 34 | ||||
-rw-r--r-- | swarm/pss/types.go | 12 | ||||
-rw-r--r-- | swarm/pss/writeup.md | 24 |
17 files changed, 125 insertions, 125 deletions
diff --git a/swarm/pss/api.go b/swarm/pss/api.go index 9cb1208f4..eb9fd2c73 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 89c6d9b13..47a9cd3da 100644 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index ed01badb2..9aded872a 100644 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index cd60ec341..efb74453e 100644 --- a/swarm/pss/client/doc.go +++ b/swarm/pss/client/doc.go @@ -28,11 +28,11 @@ // "context" // "fmt" // "os" -// pss "github.com/dexon-foundation/dexon/swarm/pss/client" -// "github.com/dexon-foundation/dexon/p2p/protocols" -// "github.com/dexon-foundation/dexon/p2p" -// "github.com/dexon-foundation/dexon/swarm/pot" -// "github.com/dexon-foundation/dexon/swarm/log" +// pss "github.com/tangerine-network/go-tangerine/swarm/pss/client" +// "github.com/tangerine-network/go-tangerine/p2p/protocols" +// "github.com/tangerine-network/go-tangerine/p2p" +// "github.com/tangerine-network/go-tangerine/swarm/pot" +// "github.com/tangerine-network/go-tangerine/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/forwarding_test.go b/swarm/pss/forwarding_test.go index 983c69c97..87ad1446d 100644 --- a/swarm/pss/forwarding_test.go +++ b/swarm/pss/forwarding_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type testCase struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index d637042a0..5c2008432 100644 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 25454db0c..f07453c88 100644 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/keystore.go b/swarm/pss/keystore.go index 72e8ebb30..78dd440df 100644 --- a/swarm/pss/keystore.go +++ b/swarm/pss/keystore.go @@ -22,11 +22,11 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/log" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/log" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) type KeyStore struct { diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index 60e429262..bd6813b35 100644 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index e6a1e17c0..1a882bcc1 100644 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pss" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pss" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index b45bd169b..dd3f23942 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index d3751f157..d73f74af7 100644 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 6d379c067..9ecea4a82 100644 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/swarm/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index b371f615e..a007337fe 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -27,18 +27,18 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/log" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - "github.com/dexon-foundation/dexon/swarm/storage" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/log" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/storage" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" "golang.org/x/crypto/sha3" ) diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 2de8988cd..5f7a914ee 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,23 +34,23 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/protocols" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/pot" - "github.com/dexon-foundation/dexon/swarm/state" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/protocols" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/swarm/pot" + "github.com/tangerine-network/go-tangerine/swarm/state" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index d66a2d4e3..1148f4ebb 100644 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rlp" - "github.com/dexon-foundation/dexon/swarm/storage" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rlp" + "github.com/tangerine-network/go-tangerine/swarm/storage" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) const ( diff --git a/swarm/pss/writeup.md b/swarm/pss/writeup.md index 06f72c4d6..283e393d8 100644 --- a/swarm/pss/writeup.md +++ b/swarm/pss/writeup.md @@ -36,22 +36,22 @@ go test -race -v ./swarm/pss -cpu 4 -run TestNetwork 1 ================== 2 WARNING: DATA RACE 3 Read at 0x00c424d456a0 by goroutine 1089: - 4 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).forward.func1() - 5 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:654 +0x44f - 6 github.com/dexon-foundation/dexon/swarm/network.(*Kademlia).eachConn.func1() - 7 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/network/kademlia.go:350 +0xc9 - 8 github.com/dexon-foundation/dexon/pot.(*Pot).eachNeighbour.func1() - 9 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/pot/pot.go:599 +0x59 + 4 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).forward.func1() + 5 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:654 +0x44f + 6 github.com/tangerine-network/go-tangerine/swarm/network.(*Kademlia).eachConn.func1() + 7 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/network/kademlia.go:350 +0xc9 + 8 github.com/tangerine-network/go-tangerine/pot.(*Pot).eachNeighbour.func1() + 9 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/pot/pot.go:599 +0x59 ... 28 29 Previous write at 0x00c424d456a0 by goroutine 829: - 30 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run() - 31 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:192 +0x16a - 32 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run-fm() - 33 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:185 +0x63 - 34 github.com/dexon-foundation/dexon/p2p.(*Peer).startProtocols.func1() - 35 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/p2p/peer.go:347 +0x8b + 30 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).Run() + 31 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:192 +0x16a + 32 github.com/tangerine-network/go-tangerine/swarm/pss.(*Pss).Run-fm() + 33 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/swarm/pss/pss.go:185 +0x63 + 34 github.com/tangerine-network/go-tangerine/p2p.(*Peer).startProtocols.func1() + 35 /Users/nonsense/code/src/github.com/tangerine-network/go-tangerine/p2p/peer.go:347 +0x8b ... ``` |