Skip to content

Commit

Permalink
Merge branch 'master' into kan/clean-up-secondary-result-index
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangchiqing committed Oct 22, 2021
2 parents 4d32b0b + 054feed commit 2545d95
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion integration/tests/common/blockstate/block_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ func (bs *BlockState) Add(b *messages.BlockProposal) {
// It also processes the seals of blocks being finalized.
func (bs *BlockState) processAncestors(b *messages.BlockProposal, confirmsHeight uint64) {
// puts this block proposal and all ancestors into `finalizedByHeight`
fmt.Printf("new height arrived: %d \n", b.Header.Height)
ancestor, ok := b, true
for ancestor.Header.Height > bs.highestFinalized {
heightDistance := b.Header.Height - ancestor.Header.Height
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/network/network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func readLoop(ctx context.Context, id flow.Identifier, net *testnet.FlowNetwork,

switch v := event.(type) {
case *message.TestMessage:
t.Logf("%s: %s: %s\n", id.String(), actualOriginID.String(), v.Text)
t.Logf("%s: %s: %s", id.String(), actualOriginID.String(), v.Text)
assert.Equal(t, expectedOrigin, actualOriginID)
assert.Equal(t, expectedMsg, v.Text)
return
Expand Down

0 comments on commit 2545d95

Please sign in to comment.