block module -> import as blk

cmd/daemon.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/tendermint/tendermint/block"
+	blk "github.com/tendermint/tendermint/block"
 	. "github.com/tendermint/tendermint/common"
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/consensus"
@@ -20,7 +20,7 @@ type Node struct {
 	sw               *p2p.Switch
 	book             *p2p.AddrBook
 	pexReactor       *p2p.PEXReactor
-	blockStore       *block.BlockStore
+	blockStore       *blk.BlockStore
 	mempoolReactor   *mempl.MempoolReactor
 	consensusState   *consensus.ConsensusState
 	consensusReactor *consensus.ConsensusReactor
@@ -30,7 +30,7 @@ type Node struct {
 func NewNode() *Node {
 	// Get BlockStore
 	blockStoreDB := dbm.GetDB("blockstore")
-	blockStore := block.NewBlockStore(blockStoreDB)
+	blockStore := blk.NewBlockStore(blockStoreDB)
 
 	// Get State
 	stateDB := dbm.GetDB("state")

cmd/gen_tx.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/tendermint/tendermint/account"
 	"github.com/tendermint/tendermint/binary"
-	"github.com/tendermint/tendermint/block"
+	blk "github.com/tendermint/tendermint/block"
 	. "github.com/tendermint/tendermint/common"
 	dbm "github.com/tendermint/tendermint/db"
 	sm "github.com/tendermint/tendermint/state"
@@ -80,9 +80,9 @@ func gen_tx() {
 	dstSendAmount := getUint64(Fmt("Enter amount to send to %X: ", dstAddress))
 
 	// Construct SendTx
-	tx := &block.SendTx{
-		Inputs: []*block.TxInput{
-			&block.TxInput{
+	tx := &blk.SendTx{
+		Inputs: []*blk.TxInput{
+			&blk.TxInput{
 				Address:   srcAddress,
 				Amount:    srcSendAmount,
 				Sequence:  srcSendSequence,
@@ -90,8 +90,8 @@ func gen_tx() {
 				PubKey:    srcPubKey,
 			},
 		},
-		Outputs: []*block.TxOutput{
-			&block.TxOutput{
+		Outputs: []*blk.TxOutput{
+			&blk.TxOutput{
 				Address: dstAddress,
 				Amount:  dstSendAmount,
 			},