forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: gofmt applied

Browse source
This commit is contained in:
Vlad 2019-03-06 17:03:58 +04:00
parent 1d7aa22424
commit 4de05a3a43
2 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swarm/network/simulation/kademlia.go
View file

@ -169,7 +169,7 @@ func isAllDeployed(expected []uint64, actual []uint64) bool {
} }
func removeListElement(arr []uint64, i int) []uint64 { func removeListElement(arr []uint64, i int) []uint64 {
last := len(arr)-1 last := len(arr) - 1
arr[i] = arr[last] arr[i] = arr[last]
arr = arr[:last] arr = arr[:last]
return arr return arr
@ -178,7 +178,7 @@ func removeListElement(arr []uint64, i int) []uint64 {
func removeDuplicatesAndSingletons(arr []uint64) []uint64 { func removeDuplicatesAndSingletons(arr []uint64) []uint64 {
for i := 0; i < len(arr); { for i := 0; i < len(arr); {
found := false found := false
for j := i+1; j < len(arr); j++ { for j := i + 1; j < len(arr); j++ {
if arr[i] == arr[j] { if arr[i] == arr[j] {
arr = removeListElement(arr, j) // remove duplicate arr = removeListElement(arr, j) // remove duplicate
found = true found = true

58
swarm/pss/snapshot_test.go
View file

@ -46,28 +46,28 @@ var (
runNodes = flag.Int("nodes", 0, "nodes to start in the network") runNodes = flag.Int("nodes", 0, "nodes to start in the network")
runMessages = flag.Int("messages", 0, "messages to send during test") runMessages = flag.Int("messages", 0, "messages to send during test")
pof = pot.DefaultPof(256) // generate messages and index them pof = pot.DefaultPof(256) // generate messages and index them
topic = BytesToTopic([]byte{0x00, 0x00, 0x06, 0x82}) topic = BytesToTopic([]byte{0x00, 0x00, 0x06, 0x82})
mu sync.Mutex // keeps handlerDonc in sync mu sync.Mutex // keeps handlerDonc in sync
sim *simulation.Simulation sim *simulation.Simulation
handlerDone bool // set to true on termination of the simulation run handlerDone bool // set to true on termination of the simulation run
msgsToReceive int // total count of messages to receive, used for terminating the simulation run msgsToReceive int // total count of messages to receive, used for terminating the simulation run
maxMessages int maxMessages int
msgCnt int msgCnt int
kademlias map[enode.ID]*network.Kademlia kademlias map[enode.ID]*network.Kademlia
nodeAddrs map[enode.ID][]byte // make predictable overlay addresses from the generated random enode ids nodeAddrs map[enode.ID][]byte // make predictable overlay addresses from the generated random enode ids
recipients map[int][]enode.ID // for logging output only recipients map[int][]enode.ID // for logging output only
allowed map[int][]enode.ID // allowed recipients allowed map[int][]enode.ID // allowed recipients
expectedMsgs map[enode.ID][]uint64 // message serials we expect respective nodes to receive expectedMsgs map[enode.ID][]uint64 // message serials we expect respective nodes to receive
allowedMsgs map[enode.ID][]uint64 // message serials we expect respective nodes to receive allowedMsgs map[enode.ID][]uint64 // message serials we expect respective nodes to receive
senders map[int]enode.ID // originating nodes of the messages (intention is to choose as far as possible from the receiving neighborhood) senders map[int]enode.ID // originating nodes of the messages (intention is to choose as far as possible from the receiving neighborhood)
handlerC chan handlerNotification // passes message from pss message handler to simulation driver handlerC chan handlerNotification // passes message from pss message handler to simulation driver
doneC chan struct{} // terminates the handler channel listener doneC chan struct{} // terminates the handler channel listener
errC chan error // error to pass to main sim thread errC chan error // error to pass to main sim thread
msgC chan handlerNotification // message receipt notification to main sim thread msgC chan handlerNotification // message receipt notification to main sim thread
msgs [][]byte // recipient addresses of messages msgs [][]byte // recipient addresses of messages
) )
func resetTestVariables() { func resetTestVariables() {
@ -78,21 +78,17 @@ func resetTestVariables() {
msgs = nil msgs = nil
sim = nil sim = nil
kademlias = make(map[enode.ID]*network.Kademlia) kademlias = make(map[enode.ID]*network.Kademlia)
nodeAddrs = make(map[enode.ID][]byte) nodeAddrs = make(map[enode.ID][]byte)
recipients = make(map[int][]enode.ID) recipients = make(map[int][]enode.ID)
allowed = make(map[int][]enode.ID) allowed = make(map[int][]enode.ID)
expectedMsgs = make(map[enode.ID][]uint64) expectedMsgs = make(map[enode.ID][]uint64)
allowedMsgs = make(map[enode.ID][]uint64) allowedMsgs = make(map[enode.ID][]uint64)
senders = make(map[int]enode.ID) senders = make(map[int]enode.ID)
handlerC = make(chan handlerNotification) handlerC = make(chan handlerNotification)
doneC = make(chan struct{}) doneC = make(chan struct{})
errC = make(chan error) errC = make(chan error)
msgC = make(chan handlerNotification) msgC = make(chan handlerNotification)
}
func init() {
log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
} }
func isDone() bool { func isDone() bool {