diff --git a/Makefile b/Makefile index 6a9bd8ce4f9defb04a2d69b11e6270e725aa672e..2af4772ae153471f02a81077d9d1994d1eaf2177 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,8 @@ ios: @echo "Import \"$(GOBIN)/bor.framework\" to use the library." test: bor - go test github.com/maticnetwork/bor/consensus/bor/bor_test + go test github.com/maticnetwork/bor/consensus/bor + go test github.com/maticnetwork/bor/tests/bor lint: ## Run linters. $(GORUN) build/ci.go lint diff --git a/consensus/bor/bor_test/snapshot_test.go b/consensus/bor/snapshot_test.go similarity index 73% rename from consensus/bor/bor_test/snapshot_test.go rename to consensus/bor/snapshot_test.go index 6eb43b3e60374dc594cdbd02209e8a73de81607e..b20fc447718e0dc707b29076c81d38a8a67883ab 100644 --- a/consensus/bor/bor_test/snapshot_test.go +++ b/consensus/bor/snapshot_test.go @@ -1,4 +1,4 @@ -package bortest +package bor import ( "math/rand" @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/maticnetwork/bor/common" - "github.com/maticnetwork/bor/consensus/bor" ) const ( @@ -18,8 +17,8 @@ const ( func TestGetSignerSuccessionNumber_ProposerIsSigner(t *testing.T) { validators := buildRandomValidatorSet(numVals) - validatorSet := bor.NewValidatorSet(validators) - snap := bor.Snapshot{ + validatorSet := NewValidatorSet(validators) + snap := Snapshot{ ValidatorSet: validatorSet, } @@ -35,14 +34,14 @@ func TestGetSignerSuccessionNumber_ProposerIsSigner(t *testing.T) { func TestGetSignerSuccessionNumber_SignerIndexIsLarger(t *testing.T) { validators := buildRandomValidatorSet(numVals) - // sort validators by address, which is what bor.NewValidatorSet also does - sort.Sort(bor.ValidatorsByAddress(validators)) + // sort validators by address, which is what NewValidatorSet also does + sort.Sort(ValidatorsByAddress(validators)) proposerIndex := 32 signerIndex := 56 // give highest ProposerPriority to a particular val, so that they become the proposer validators[proposerIndex].VotingPower = 200 - snap := bor.Snapshot{ - ValidatorSet: bor.NewValidatorSet(validators), + snap := Snapshot{ + ValidatorSet: NewValidatorSet(validators), } // choose a signer at an index greater than proposer index @@ -60,8 +59,8 @@ func TestGetSignerSuccessionNumber_SignerIndexIsSmaller(t *testing.T) { signerIndex := 11 // give highest ProposerPriority to a particular val, so that they become the proposer validators[proposerIndex].VotingPower = 200 - snap := bor.Snapshot{ - ValidatorSet: bor.NewValidatorSet(validators), + snap := Snapshot{ + ValidatorSet: NewValidatorSet(validators), } // choose a signer at an index greater than proposer index @@ -75,46 +74,46 @@ func TestGetSignerSuccessionNumber_SignerIndexIsSmaller(t *testing.T) { func TestGetSignerSuccessionNumber_ProposerNotFound(t *testing.T) { validators := buildRandomValidatorSet(numVals) - snap := bor.Snapshot{ - ValidatorSet: bor.NewValidatorSet(validators), + snap := Snapshot{ + ValidatorSet: NewValidatorSet(validators), } dummyProposerAddress := randomAddress() - snap.ValidatorSet.Proposer = &bor.Validator{Address: dummyProposerAddress} + snap.ValidatorSet.Proposer = &Validator{Address: dummyProposerAddress} // choose any signer signer := snap.ValidatorSet.Validators[3].Address _, err := snap.GetSignerSuccessionNumber(signer) assert.NotNil(t, err) - e, ok := err.(*bor.UnauthorizedProposerError) + e, ok := err.(*UnauthorizedProposerError) assert.True(t, ok) assert.Equal(t, dummyProposerAddress.Bytes(), e.Proposer) } func TestGetSignerSuccessionNumber_SignerNotFound(t *testing.T) { validators := buildRandomValidatorSet(numVals) - snap := bor.Snapshot{ - ValidatorSet: bor.NewValidatorSet(validators), + snap := Snapshot{ + ValidatorSet: NewValidatorSet(validators), } dummySignerAddress := randomAddress() _, err := snap.GetSignerSuccessionNumber(dummySignerAddress) assert.NotNil(t, err) - e, ok := err.(*bor.UnauthorizedSignerError) + e, ok := err.(*UnauthorizedSignerError) assert.True(t, ok) assert.Equal(t, dummySignerAddress.Bytes(), e.Signer) } -func buildRandomValidatorSet(numVals int) []*bor.Validator { +func buildRandomValidatorSet(numVals int) []*Validator { rand.Seed(time.Now().Unix()) - validators := make([]*bor.Validator, numVals) + validators := make([]*Validator, numVals) for i := 0; i < numVals; i++ { - validators[i] = &bor.Validator{ + validators[i] = &Validator{ Address: randomAddress(), // cannot process validators with voting power 0, hence +1 VotingPower: int64(rand.Intn(99) + 1), } } - // sort validators by address, which is what bor.NewValidatorSet also does - sort.Sort(bor.ValidatorsByAddress(validators)) + // sort validators by address, which is what NewValidatorSet also does + sort.Sort(ValidatorsByAddress(validators)) return validators } diff --git a/consensus/bor/bor_test/bor_test.go b/tests/bor/bor_test.go similarity index 99% rename from consensus/bor/bor_test/bor_test.go rename to tests/bor/bor_test.go index 2994143d12a5f7d28271723d0436b9a0fa564a36..a2c5849be6c9ddbb75c2b9049a726ba00009faed 100644 --- a/consensus/bor/bor_test/bor_test.go +++ b/tests/bor/bor_test.go @@ -1,4 +1,4 @@ -package bortest +package bor import ( "encoding/hex" diff --git a/consensus/bor/bor_test/helper.go b/tests/bor/helper.go similarity index 96% rename from consensus/bor/bor_test/helper.go rename to tests/bor/helper.go index d02c3463fc4e942ebab69c34c9f2952e62b55c4e..93c2f880a2c816f5650b5e63e14498d6f72c8291 100644 --- a/consensus/bor/bor_test/helper.go +++ b/tests/bor/helper.go @@ -1,4 +1,4 @@ -package bortest +package bor import ( "encoding/hex" @@ -45,7 +45,7 @@ type initializeData struct { } func buildEthereumInstance(t *testing.T, db ethdb.Database) *initializeData { - genesisData, err := ioutil.ReadFile("genesis.json") + genesisData, err := ioutil.ReadFile("./testdata/genesis.json") if err != nil { t.Fatalf("%s", err) } @@ -157,7 +157,7 @@ func sign(t *testing.T, header *types.Header, signer []byte) { } func stateSyncEventsPayload(t *testing.T) *bor.ResponseWithHeight { - stateData, err := ioutil.ReadFile("states.json") + stateData, err := ioutil.ReadFile("./testdata/states.json") if err != nil { t.Fatalf("%s", err) } @@ -169,7 +169,7 @@ func stateSyncEventsPayload(t *testing.T) *bor.ResponseWithHeight { } func loadSpanFromFile(t *testing.T) (*bor.ResponseWithHeight, *bor.HeimdallSpan) { - spanData, err := ioutil.ReadFile("span.json") + spanData, err := ioutil.ReadFile("./testdata/span.json") if err != nil { t.Fatalf("%s", err) } diff --git a/consensus/bor/bor_test/genesis.json b/tests/bor/testdata/genesis.json similarity index 100% rename from consensus/bor/bor_test/genesis.json rename to tests/bor/testdata/genesis.json diff --git a/consensus/bor/bor_test/span.json b/tests/bor/testdata/span.json similarity index 100% rename from consensus/bor/bor_test/span.json rename to tests/bor/testdata/span.json diff --git a/consensus/bor/bor_test/states.json b/tests/bor/testdata/states.json similarity index 100% rename from consensus/bor/bor_test/states.json rename to tests/bor/testdata/states.json