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

swarm/swap: rebased to latest master

Browse source
This commit is contained in:
Fabio Barone 2018-10-06 10:45:44 -05:00
parent 9479baed51
commit 8e186d8a46
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
swarm/swap_test.go
View file

@ -54,7 +54,7 @@ func TestSwapNetworkSymmetricFileUpload(t *testing.T) {
config := api.NewConfig() config := api.NewConfig()
config.Port = strconv.Itoa(8500 + rand.Intn(9999)) config.Port = strconv.Itoa(8500 + rand.Intn(9999))
dir, err := ioutil.TempDir("", "swap-network-test-node") dir, err := ioutil.TempDir("", "swap-network-test-node"+config.Port)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -233,7 +233,7 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
config := api.NewConfig() config := api.NewConfig()
config.Port = strconv.Itoa(8500 + rand.Intn(9999)) config.Port = strconv.Itoa(8500 + rand.Intn(9999))
dir, err := ioutil.TempDir("", "swap-network-test-node") dir, err := ioutil.TempDir("", "swap-network-test-node"+config.Port)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -290,6 +290,10 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
pseudoRandomBitMask := strconv.FormatInt(pseudoRandomNum, 2) pseudoRandomBitMask := strconv.FormatInt(pseudoRandomNum, 2)
result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error { result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error {
if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
return err
}
nodeIDs := sim.UpNodeIDs() nodeIDs := sim.UpNodeIDs()
shuffle(len(nodeIDs), func(i, j int) { shuffle(len(nodeIDs), func(i, j int) {
nodeIDs[i], nodeIDs[j] = nodeIDs[j], nodeIDs[i] nodeIDs[i], nodeIDs[j] = nodeIDs[j], nodeIDs[i]
@ -311,10 +315,6 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
} }
} }
if _, err := sim.WaitTillHealthy(ctx, 2); err != nil {
return err
}
// File retrieval check is repeated until all uploaded files are retrieved from all nodes // File retrieval check is repeated until all uploaded files are retrieved from all nodes
// or until the timeout is reached. // or until the timeout is reached.
for { for {
@ -362,6 +362,8 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
/* /*
Assuming that in this case, balances should be symmetric too I Assuming that in this case, balances should be symmetric too I
*/ */
success := true
for k, mapForK := range balancesMap { for k, mapForK := range balancesMap {
for n, balanceKwithN := range mapForK { for n, balanceKwithN := range mapForK {
for subK, mapForSubK := range balancesMap { for subK, mapForSubK := range balancesMap {
@ -370,13 +372,18 @@ func TestSwapNetworkAsymmetricFileUpload(t *testing.T) {
log.Trace(fmt.Sprintf("balance of %s with %s: %d", n.TerminalString(), k.TerminalString(), mapForSubK[k])) log.Trace(fmt.Sprintf("balance of %s with %s: %d", n.TerminalString(), k.TerminalString(), mapForSubK[k]))
if math.Abs(float64(balanceKwithN)) != math.Abs(float64(mapForSubK[k])) && balanceKwithN != 0 { if math.Abs(float64(balanceKwithN)) != math.Abs(float64(mapForSubK[k])) && balanceKwithN != 0 {
log.Error("Expected balances to be |abs| = 0 AND balance1 != 0, but they are not") log.Error("Expected balances to be |abs| = 0 AND balance1 != 0, but they are not")
success = false
} }
} }
} }
} }
} }
return nil if success {
return nil
}
return errors.New("some conditions could not be met")
}) })
if result.Error != nil { if result.Error != nil {

1
swarm/swarm.go
View file

@ -51,7 +51,6 @@ import (
"github.com/ethereum/go-ethereum/swarm/storage" "github.com/ethereum/go-ethereum/swarm/storage"
"github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/ethereum/go-ethereum/swarm/storage/feed"
"github.com/ethereum/go-ethereum/swarm/storage/mock" "github.com/ethereum/go-ethereum/swarm/storage/mock"
"github.com/ethereum/go-ethereum/swarm/storage/mru"
"github.com/ethereum/go-ethereum/swarm/swap" "github.com/ethereum/go-ethereum/swarm/swap"
"github.com/ethereum/go-ethereum/swarm/tracing" "github.com/ethereum/go-ethereum/swarm/tracing"
) )