JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/audit: Move test helper funcs to separated file (#2259)

Browse Source 
Move 2 helper function used for test which relay on testplanet from the
test file where they were created to separated file to contain them
because they are not only used in the test file were initially they were
created.
This commit is contained in:
Ivan Fraixedes 2019-06-20 17:38:08 +02:00 committed by GitHub
parent 9386187fe6
commit 5b31086757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/audit/testplanet_helpers_test.go Normal file
View File

@ -0,0 +1,38 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
package audit_test
import (
"context"
"fmt"
"storj.io/storj/internal/testplanet"
"storj.io/storj/pkg/storj"
"storj.io/storj/storagenode"
)
func getStorageNode(planet *testplanet.Planet, nodeID storj.NodeID) *storagenode.Peer {
for _, node := range planet.StorageNodes {
if node.ID() == nodeID {
return node
}
}
return nil
}
func stopStorageNode(ctx context.Context, planet *testplanet.Planet, nodeID storj.NodeID) error {
node := getStorageNode(planet, nodeID)
if node == nil {
return fmt.Errorf("no such node: %s", nodeID.String())
}
err := planet.StopPeer(node)
if err != nil {
return err
}
// mark stopped node as offline in overlay cache
_, err = planet.Satellites[0].Overlay.Service.UpdateUptime(ctx, nodeID, false)
return err
}

27
pkg/audit/verifier_test.go
View File

@ -5,7 +5,6 @@ package audit_test
import (
"context"
"fmt"
"math/rand"
"testing"
"time"
@ -24,7 +23,6 @@ import (
"storj.io/storj/pkg/peertls/tlsopts"
"storj.io/storj/pkg/storj"
"storj.io/storj/pkg/transport"
"storj.io/storj/storagenode"
"storj.io/storj/uplink"
)
@ -634,28 +632,3 @@ func TestVerifierModifiedSegment(t *testing.T) {
assert.Empty(t, report)
})
}
func getStorageNode(planet *testplanet.Planet, nodeID storj.NodeID) *storagenode.Peer {
for _, node := range planet.StorageNodes {
if node.ID() == nodeID {
return node
}
}
return nil
}
func stopStorageNode(ctx context.Context, planet *testplanet.Planet, nodeID storj.NodeID) error {
node := getStorageNode(planet, nodeID)
if node == nil {
return fmt.Errorf("no such node: %s", nodeID.String())
}
err := planet.StopPeer(node)
if err != nil {
return err
}
// mark stopped node as offline in overlay cache
_, err = planet.Satellites[0].Overlay.Service.UpdateUptime(ctx, nodeID, false)
return err
}