OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit code while reviewing the code (#255)
[bytom/vapor.git]
/
proposal
/
blockproposer
/
blockproposer.go
diff --git
a/proposal/blockproposer/blockproposer.go
b/proposal/blockproposer/blockproposer.go
index
32105db
..
0b568cf
100644
(file)
--- a/
proposal/blockproposer/blockproposer.go
+++ b/
proposal/blockproposer/blockproposer.go
@@
-64,13
+64,13
@@
func (b *BlockProposer) generateBlocks() {
nextBlockTime += consensus.BlockTimeInterval
}
nextBlockTime += consensus.BlockTimeInterval
}
-
isBlocker, err := b.chain.IsBlocker(&bestBlockHash, xpubStr
, nextBlockTime)
+
blocker, err := b.chain.GetBlocker(&bestBlockHash
, nextBlockTime)
if err != nil {
log.WithFields(log.Fields{"module": logModule, "error": err, "pubKey": xpubStr}).Error("fail on check is next blocker")
continue
}
if err != nil {
log.WithFields(log.Fields{"module": logModule, "error": err, "pubKey": xpubStr}).Error("fail on check is next blocker")
continue
}
- if
!isB
locker {
+ if
xpubStr != b
locker {
continue
}
continue
}