status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Swap GetNetworkIDHash/GetHeadHashForNetworkID

This commit is contained in:
Alexander Ewetumo 2017-10-25 23:24:01 +01:00
parent 8207a2724d
commit e80768a090
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -146,10 +146,10 @@ test-e2e: ##@tests Run e2e tests
# order: reliability then alphabetical # order: reliability then alphabetical
# TODO(tiabc): make a single command out of them adding `-p 1` flag. # TODO(tiabc): make a single command out of them adding `-p 1` flag.
build/env.sh go test -timeout 5m ./e2e/accounts/... build/env.sh go test -timeout 5m ./e2e/accounts/...
build/env.sh go test -timeout 5m ./e2e/api/... -network=4 build/env.sh go test -timeout 5m ./e2e/api/... -network=3
build/env.sh go test -timeout 5m ./e2e/node/... build/env.sh go test -timeout 5m ./e2e/node/...
build/env.sh go test -timeout 15m ./e2e/jail/... build/env.sh go test -timeout 15m ./e2e/jail/...
build/env.sh go test -timeout 20m ./e2e/rpc/... -network=4 build/env.sh go test -timeout 20m ./e2e/rpc/... -network=3
build/env.sh go test -timeout 20m ./e2e/whisper/... build/env.sh go test -timeout 20m ./e2e/whisper/...
build/env.sh go test -timeout 10m ./e2e/transactions/... build/env.sh go test -timeout 10m ./e2e/transactions/...
build/env.sh go test -timeout 40m ./cmd/statusd build/env.sh go test -timeout 40m ./cmd/statusd

2
e2e/api/backend_test.go
View File

@ -262,7 +262,7 @@ func (s *APIBackendTestSuite) TestRestartNode() {
require := s.Require() require := s.Require()
require.NotNil(s.Backend) require.NotNil(s.Backend)
// get Ropsten config // get config
nodeConfig, err := e2e.MakeTestNodeConfig(GetNetworkID()) nodeConfig, err := e2e.MakeTestNodeConfig(GetNetworkID())
s.NoError(err) s.NoError(err)

4
e2e/node/manager_test.go
View File

@ -311,7 +311,7 @@ func (s *ManagerTestSuite) TestResetChainData() {
// make sure we can read the first byte, and it is valid (for Rinkeby) // make sure we can read the first byte, and it is valid (for Rinkeby)
firstHash, err := e2e.FirstBlockHash(s.NodeManager) firstHash, err := e2e.FirstBlockHash(s.NodeManager)
s.NoError(err) s.NoError(err)
s.Equal(GetNetworkHash(), firstHash) s.Equal(GetHeadHashForNetworkID(), firstHash)
} }
func (s *ManagerTestSuite) TestRestartNode() { func (s *ManagerTestSuite) TestRestartNode() {
@ -328,7 +328,7 @@ func (s *ManagerTestSuite) TestRestartNode() {
// make sure we can read the first byte, and it is valid (for Rinkeby) // make sure we can read the first byte, and it is valid (for Rinkeby)
firstHash, err := e2e.FirstBlockHash(s.NodeManager) firstHash, err := e2e.FirstBlockHash(s.NodeManager)
s.NoError(err) s.NoError(err)
s.Equal(GetNetworkHash(), firstHash) s.Equal(GetHeadHashForNetworkID(), firstHash)
} }
// TODO(adam): race conditions should be tested with -race flag and unit tests, if possible. // TODO(adam): race conditions should be tested with -race flag and unit tests, if possible.