refactor: model finalised notifier channel after imported notifier channel #1816
Conversation
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
edwardmack
requested review from
arijitAD,
EclesioMeloJunior,
jimjbrettj,
noot and
timwu20
as code owners
Codecov Report
@@ Coverage Diff @@
## development #1816 +/- ##
===============================================
- Coverage 59.66% 59.62% -0.04%
===============================================
Files 189 188 -1
Lines 19673 19621 -52
===============================================
- Hits 11738 11700 -38
+ Misses 5960 5952 -8
+ Partials 1975 1969 -6
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
noot
reviewed
Sep 30, 2021
| @@ -218,7 +217,7 @@ func TestWSConn_HandleComm(t *testing.T) { | |||
| require.NoError(t, err) | |||
| require.Equal(t, `{"jsonrpc":"2.0","method":"author_extrinsicUpdate","params":{"result":"ready","subscription":8}}`+"\n", string(msg)) | |||
|
|
|||
| var fCh chan<- *types.FinalisationInfo | |||
| //var fCh chan *types.FinalisationInfo | |||
arijitAD
approved these changes
Oct 5, 2021
|
|
||
| bs.finalisedLock.RUnlock() | ||
| ch := make(chan *types.FinalisationInfo, DEFAULT_BUFFER_SIZE) |
There was a problem hiding this comment.
DEFAULT_BUFFER_SIZE make this camelcase.
| @@ -74,7 +73,7 @@ func NewBlockState(db chaindb.Database, bt *blocktree.BlockTree) (*BlockState, e | |||
| baseState: NewBaseState(db), | |||
| db: chaindb.NewTable(db, blockPrefix), | |||
| imported: make(map[chan *types.Block]struct{}), | |||
| finalised: make(map[byte]chan<- *types.FinalisationInfo), | |||
| finalised: make(map[chan *types.FinalisationInfo]struct{}), | |||
There was a problem hiding this comment.
Nice. I didn't know we could create a map with channels as key.
| for _, ch := range bs.finalised { | ||
| go func(ch chan<- *types.FinalisationInfo) { | ||
| for ch := range bs.finalised { | ||
| go func(ch chan *types.FinalisationInfo) { |
There was a problem hiding this comment.
Suggested change
| go func(ch chan *types.FinalisationInfo) { | |
| go func(ch chan<- *types.FinalisationInfo) { |
| if err != nil { | ||
| logger.Error("failed to unregister finalised channel", "error", err) | ||
| } | ||
| delete(bs.finalised, ch) |
There was a problem hiding this comment.
Explicitly close the channel
close(ch)
There was a problem hiding this comment.
// FreeImportedBlockNotifierChannel to free imported block notifier channel
func (bs *BlockState) FreeImportedBlockNotifierChannel(ch chan *types.Block) {
bs.importedLock.Lock()
defer bs.importedLock.Unlock()
delete(bs.imported, ch)
close(ch)
}
// FreeFinalisedNotifierChannel to free finalized notifier channel
func (bs *BlockState) FreeFinalisedNotifierChannel(ch chan *types.FinalisationInfo) {
bs.finalisedLock.Lock()
defer bs.finalisedLock.Unlock()
delete(bs.finalised, ch)
close(ch)
}
|
🎉 This PR is included in version 0.6.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
timwu20
pushed a commit
to timwu20/gossamer
that referenced
this pull request
Dec 6, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Tests
Issues
Primary Reviewer