-
Notifications
You must be signed in to change notification settings - Fork 958
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix beacon-chain/sync Test Race (#390)
* fix beacon-chain/sync test race * address review comments * remove unused file * gazelle * disable race for client/contracts * address review comments * fix conflict * remove duplicated deps, embed * remove unneeded file
- Loading branch information
1 parent
2060d29
commit dd29481
Showing
12 changed files
with
218 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package syncer | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "math/big" | ||
| "testing" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common" | ||
| gethTypes "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/prysmaticlabs/prysm/client/mainchain" | ||
| "github.com/prysmaticlabs/prysm/client/params" | ||
| "github.com/prysmaticlabs/prysm/client/types" | ||
| pb "github.com/prysmaticlabs/prysm/proto/sharding/p2p/v1" | ||
| "github.com/prysmaticlabs/prysm/shared/database" | ||
| "github.com/prysmaticlabs/prysm/shared/p2p" | ||
| "github.com/sirupsen/logrus" | ||
| logTest "github.com/sirupsen/logrus/hooks/test" | ||
| ) | ||
|
|
||
| func init() { | ||
| logrus.SetLevel(logrus.DebugLevel) | ||
| logrus.SetOutput(ioutil.Discard) | ||
| } | ||
|
|
||
| // This test checks the proper functioning of the handleCollationBodyRequests goroutine | ||
| // by listening to the responseSent channel which occurs after successful | ||
| // construction and sending of a response via p2p. | ||
| func TestHandleCollationBodyRequests(t *testing.T) { | ||
| hook := logTest.NewGlobal() | ||
|
|
||
| config := &database.DBConfig{Name: "", DataDir: "", InMemory: true} | ||
| shardChainDB, err := database.NewDB(config) | ||
| if err != nil { | ||
| t.Fatalf("unable to setup db: %v", err) | ||
| } | ||
| server, err := p2p.NewServer() | ||
| if err != nil { | ||
| t.Fatalf("Unable to setup p2p server: %v", err) | ||
| } | ||
|
|
||
| body := []byte{1, 2, 3, 4, 5} | ||
| shardID := big.NewInt(0) | ||
| chunkRoot := gethTypes.DeriveSha(types.Chunks(body)) | ||
| period := big.NewInt(0) | ||
| proposerAddress := common.BytesToAddress([]byte{}) | ||
|
|
||
| header := types.NewCollationHeader(shardID, &chunkRoot, period, &proposerAddress, [32]byte{}) | ||
| // Stores the collation into the inmemory kv store shardChainDB. | ||
| collation := types.NewCollation(header, body, nil) | ||
|
|
||
| shard := types.NewShard(shardID, shardChainDB.DB()) | ||
|
|
||
| if err := shard.SaveCollation(collation); err != nil { | ||
| t.Fatalf("Could not store collation in shardChainDB: %v", err) | ||
| } | ||
|
|
||
| syncer, err := NewSyncer(params.DefaultConfig(), &mainchain.SMCClient{}, server, shardChainDB, 0) | ||
| if err != nil { | ||
| t.Fatalf("Unable to setup syncer service: %v", err) | ||
| } | ||
| syncer.Start() | ||
| syncer.collationBodyBuf = make(chan p2p.Message) | ||
|
|
||
| doneChan := make(chan struct{}) | ||
| exitRoutine := make(chan bool) | ||
|
|
||
| go func() { | ||
| syncer.run(doneChan) | ||
| <-exitRoutine | ||
| }() | ||
|
|
||
| msg := p2p.Message{ | ||
| Peer: p2p.Peer{}, | ||
| Data: &pb.CollationBodyRequest{ | ||
| ChunkRoot: chunkRoot.Bytes(), | ||
| ShardId: shardID.Uint64(), | ||
| Period: period.Uint64(), | ||
| ProposerAddress: proposerAddress.Bytes(), | ||
| }, | ||
| } | ||
| syncer.collationBodyBuf <- msg | ||
| doneChan <- struct{}{} | ||
| exitRoutine <- true | ||
|
|
||
| logMsg := hook.Entries[1].Message | ||
| want := fmt.Sprintf("Received p2p request of type: %T", &pb.CollationBodyRequest{}) | ||
| if logMsg != want { | ||
| t.Errorf("incorrect log, expected %s, got %s", want, logMsg) | ||
| } | ||
|
|
||
| logMsg = hook.Entries[4].Message | ||
| want = fmt.Sprintf("Responding to p2p collation request") | ||
| if logMsg != want { | ||
| t.Errorf("incorrect log, expected %s, got %s", want, logMsg) | ||
| } | ||
| hook.Reset() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.