fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-01 01:32:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix commonly misspelled words

Browse Source
This commit is contained in:
spring1843 2017-05-20 21:43:00 -07:00
parent 267f134d44
commit cf686d4f83
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consensus/state_test.go
View File

@ -544,7 +544,7 @@ func TestLockPOLRelock(t *testing.T) {
// timeout to new round // timeout to new round
<-timeoutWaitCh <-timeoutWaitCh
//XXX: this isnt gauranteed to get there before the timeoutPropose ... //XXX: this isnt guaranteed to get there before the timeoutPropose ...
cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer") cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
<-newRoundCh <-newRoundCh
@ -655,7 +655,7 @@ func TestLockPOLUnlock(t *testing.T) {
rs = re.(types.TMEventData).Unwrap().(types.EventDataRoundState).RoundState.(*RoundState) rs = re.(types.TMEventData).Unwrap().(types.EventDataRoundState).RoundState.(*RoundState)
lockedBlockHash := rs.LockedBlock.Hash() lockedBlockHash := rs.LockedBlock.Hash()
//XXX: this isnt gauranteed to get there before the timeoutPropose ... //XXX: this isnt guaranteed to get there before the timeoutPropose ...
cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer") cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
<-newRoundCh <-newRoundCh
@ -742,7 +742,7 @@ func TestLockPOLSafety1(t *testing.T) {
incrementRound(vs2, vs3, vs4) incrementRound(vs2, vs3, vs4)
//XXX: this isnt gauranteed to get there before the timeoutPropose ... //XXX: this isnt guaranteed to get there before the timeoutPropose ...
cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer") cs1.SetProposalAndBlock(prop, propBlock, propBlockParts, "some peer")
<-newRoundCh <-newRoundCh

2
consensus/ticker.go
View File

@ -117,7 +117,7 @@ func (t *timeoutTicker) timeoutRoutine() {
t.Logger.Debug("Scheduled timeout", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step) t.Logger.Debug("Scheduled timeout", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step)
case <-t.timer.C: case <-t.timer.C:
t.Logger.Info("Timed out", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step) t.Logger.Info("Timed out", "dur", ti.Duration, "height", ti.Height, "round", ti.Round, "step", ti.Step)
// go routine here gaurantees timeoutRoutine doesn't block. // go routine here guarantees timeoutRoutine doesn't block.
// Determinism comes from playback in the receiveRoutine. // Determinism comes from playback in the receiveRoutine.
// We can eliminate it by merging the timeoutRoutine into receiveRoutine // We can eliminate it by merging the timeoutRoutine into receiveRoutine
// and managing the timeouts ourselves with a millisecond ticker // and managing the timeouts ourselves with a millisecond ticker

2
mempool/mempool.go
View File

@ -409,7 +409,7 @@ func (cache *txCache) Push(tx types.Tx) bool {
popped := cache.list.Front() popped := cache.list.Front()
poppedTx := popped.Value.(types.Tx) poppedTx := popped.Value.(types.Tx)
// NOTE: the tx may have already been removed from the map // NOTE: the tx may have already been removed from the map
// but deleting a non-existant element is fine // but deleting a non-existent element is fine
delete(cache.map_, string(poppedTx)) delete(cache.map_, string(poppedTx))
cache.list.Remove(popped) cache.list.Remove(popped)
} }

4
rpc/client/mock/abci.go
View File

@ -40,7 +40,7 @@ func (a ABCIApp) BroadcastTxCommit(tx types.Tx) (*ctypes.ResultBroadcastTxCommit
func (a ABCIApp) BroadcastTxAsync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) { func (a ABCIApp) BroadcastTxAsync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) {
c := a.App.CheckTx(tx) c := a.App.CheckTx(tx)
// and this gets writen in a background thread... // and this gets written in a background thread...
if c.IsOK() { if c.IsOK() {
go func() { a.App.DeliverTx(tx) }() go func() { a.App.DeliverTx(tx) }()
} }
@ -49,7 +49,7 @@ func (a ABCIApp) BroadcastTxAsync(tx types.Tx) (*ctypes.ResultBroadcastTx, error
func (a ABCIApp) BroadcastTxSync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) { func (a ABCIApp) BroadcastTxSync(tx types.Tx) (*ctypes.ResultBroadcastTx, error) {
c := a.App.CheckTx(tx) c := a.App.CheckTx(tx)
// and this gets writen in a background thread... // and this gets written in a background thread...
if c.IsOK() { if c.IsOK() {
go func() { a.App.DeliverTx(tx) }() go func() { a.App.DeliverTx(tx) }()
} }

2
rpc/core/mempool.go
View File

@ -75,7 +75,7 @@ func BroadcastTxCommit(tx types.Tx) (*ctypes.ResultBroadcastTxCommit, error) {
// Wait for the tx to be included in a block, // Wait for the tx to be included in a block,
// timeout after something reasonable. // timeout after something reasonable.
// TODO: configureable? // TODO: configurable?
timer := time.NewTimer(60 * 2 * time.Second) timer := time.NewTimer(60 * 2 * time.Second)
select { select {
case deliverTxRes := <-deliverTxResCh: case deliverTxRes := <-deliverTxResCh: