fix issues with pr #86

[jeffreylean]

• move the from_block_by method to block.go
• move the block.base() function from block package to individual test cases
• remove comments of block merge in flush.go