Skip to content

Commit

Permalink
core, api: go format + docs
Browse files Browse the repository at this point in the history
  • Loading branch information
holiman committed Feb 7, 2017
1 parent 08f541c commit f9f81ff
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
17 changes: 10 additions & 7 deletions core/blockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func NewBlockChain(chainDb ethdb.Database, config *params.ChainConfig, pow pow.P
bodyRLPCache, _ := lru.New(bodyCacheLimit)
blockCache, _ := lru.New(blockCacheLimit)
futureBlocks, _ := lru.New(maxFutureBlocks)
badBlocks,_ := lru.New(badBlockLimit)
badBlocks, _ := lru.New(badBlockLimit)

bc := &BlockChain{
config: config,
Expand Down Expand Up @@ -1245,22 +1245,25 @@ func (self *BlockChain) update() {
}
}
}
// SendTxArgs represents the arguments to sumbit a new transaction into the transaction pool.

// BadBlockArgs represents the entries in the list returned when bad blocks are queried.
type BadBlockArgs struct {
Hash common.Hash `json:"hash"`
Header *types.Header `json:"header"`
Hash common.Hash `json:"hash"`
Header *types.Header `json:"header"`
}

// BadBlocks returns a list of the last 'bad blocks' that the client has seen on the network
func (bc *BlockChain) BadBlocks() ([] BadBlockArgs, error) {
func (bc *BlockChain) BadBlocks() ([]BadBlockArgs, error) {
headers := make([]BadBlockArgs, 0, bc.badBlocks.Len())
for _, hash := range bc.badBlocks.Keys() {
if hdr, exist := bc.badBlocks.Peek(hash); exist {
headers = append(headers, BadBlockArgs{ hdr.(*types.Header).Hash(), hdr.(*types.Header)})
headers = append(headers, BadBlockArgs{hdr.(*types.Header).Hash(), hdr.(*types.Header)})
}
}
return headers, nil
}
func (bc *BlockChain) addBadBlock(block *types.Block){
// Adds a 'bad lock' to the LRU
func (bc *BlockChain) addBadBlock(block *types.Block) {
bc.badBlocks.Add(block.Header().Hash(), block.Header())
}

Expand Down
3 changes: 1 addition & 2 deletions eth/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,8 @@ func (api *PrivateDebugAPI) Preimage(ctx context.Context, hash common.Hash) (hex
return db.Get(hash.Bytes())
}


// GetBadBLocks returns a list of the last 'bad blocks' that the client has seen on the network
// and returns them as a JSON list of block-hashes
func (api *PrivateDebugAPI) GetBadBlocks(ctx context.Context) ([] core.BadBlockArgs, error) {
func (api *PrivateDebugAPI) GetBadBlocks(ctx context.Context) ([]core.BadBlockArgs, error) {
return api.eth.BlockChain().BadBlocks()
}

0 comments on commit f9f81ff

Please sign in to comment.