From a403b8d0fe35e76cebf5adad9c85991f5604ef86 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Wed, 31 Jan 2018 15:23:17 +0100 Subject: [PATCH] Rename package bitcoin to bchain --- {bitcoin => bchain}/bitcoinrpc.go | 2 +- {bitcoin => bchain}/bitcoinwire.go | 2 +- {bitcoin => bchain}/mq.go | 4 ++-- {bitcoin => bchain}/types.go | 2 +- blockbook.go | 30 +++++++++++++++--------------- db/rocksdb.go | 14 +++++++------- server/https.go | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) rename {bitcoin => bchain}/bitcoinrpc.go (99%) rename {bitcoin => bchain}/bitcoinwire.go (99%) rename {bitcoin => bchain}/mq.go (96%) rename {bitcoin => bchain}/types.go (99%) diff --git a/bitcoin/bitcoinrpc.go b/bchain/bitcoinrpc.go similarity index 99% rename from bitcoin/bitcoinrpc.go rename to bchain/bitcoinrpc.go index 7fd3f3e0..4494eec7 100644 --- a/bitcoin/bitcoinrpc.go +++ b/bchain/bitcoinrpc.go @@ -1,4 +1,4 @@ -package bitcoin +package bchain import ( "bytes" diff --git a/bitcoin/bitcoinwire.go b/bchain/bitcoinwire.go similarity index 99% rename from bitcoin/bitcoinwire.go rename to bchain/bitcoinwire.go index 9bc99050..c5a3f00d 100644 --- a/bitcoin/bitcoinwire.go +++ b/bchain/bitcoinwire.go @@ -1,4 +1,4 @@ -package bitcoin +package bchain import ( "bytes" diff --git a/bitcoin/mq.go b/bchain/mq.go similarity index 96% rename from bitcoin/mq.go rename to bchain/mq.go index fbbd02bb..0e41dba7 100644 --- a/bitcoin/mq.go +++ b/bchain/mq.go @@ -1,4 +1,4 @@ -package bitcoin +package bchain import ( "encoding/binary" @@ -24,7 +24,7 @@ type MQMessage struct { // New creates new Bitcoind ZeroMQ listener // callback function receives messages -func New(binding string, callback func(*MQMessage)) (*MQ, error) { +func NewMQ(binding string, callback func(*MQMessage)) (*MQ, error) { context, err := zmq.NewContext() if err != nil { return nil, err diff --git a/bitcoin/types.go b/bchain/types.go similarity index 99% rename from bitcoin/types.go rename to bchain/types.go index 223fe477..26ba9770 100644 --- a/bitcoin/types.go +++ b/bchain/types.go @@ -1,4 +1,4 @@ -package bitcoin +package bchain import ( "github.com/btcsuite/btcd/txscript" diff --git a/blockbook.go b/blockbook.go index da0fd6df..43c8285e 100644 --- a/blockbook.go +++ b/blockbook.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "blockbook/bitcoin" + "blockbook/bchain" "blockbook/db" "blockbook/server" @@ -48,7 +48,7 @@ var ( var ( syncChannel = make(chan struct{}) - chain *bitcoin.BitcoinRPC + chain *bchain.BitcoinRPC index *db.RocksDB ) @@ -71,15 +71,15 @@ func main() { return } - chain = bitcoin.NewBitcoinRPC( + chain = bchain.NewBitcoinRPC( *rpcURL, *rpcUser, *rpcPass, time.Duration(*rpcTimeout)*time.Second) if *parse { - chain.Parser = &bitcoin.BitcoinBlockParser{ - Params: bitcoin.GetChainParams()[0], + chain.Parser = &bchain.BitcoinBlockParser{ + Params: bchain.GetChainParams()[0], } } @@ -126,13 +126,13 @@ func main() { }() } - var mq *bitcoin.MQ + var mq *bchain.MQ if *zeroMQBinding != "" { if !*synchronize { glog.Error("zeromq connection without synchronization does not make sense, ignoring zeromq parameter") } else { go syncLoop() - mq, err = bitcoin.New(*zeroMQBinding, mqHandler) + mq, err = bchain.NewMQ(*zeroMQBinding, mqHandler) if err != nil { glog.Fatal("mq: ", err) } @@ -149,7 +149,7 @@ func main() { address := *queryAddress if address != "" { - script, err := bitcoin.AddressToOutputScript(address) + script, err := bchain.AddressToOutputScript(address) if err != nil { glog.Fatalf("GetTransactions %v", err) } @@ -180,7 +180,7 @@ func syncLoop() { } } -func mqHandler(m *bitcoin.MQMessage) { +func mqHandler(m *bchain.MQMessage) { body := hex.EncodeToString(m.Body) glog.Infof("MQ: %s-%d %s", m.Topic, m.Sequence, body) if m.Topic == "hashblock" { @@ -192,7 +192,7 @@ func mqHandler(m *bitcoin.MQMessage) { } } -func waitForSignalAndShutdown(s *server.HttpServer, mq *bitcoin.MQ, timeout time.Duration) { +func waitForSignalAndShutdown(s *server.HttpServer, mq *bchain.MQ, timeout time.Duration) { stop := make(chan os.Signal, 1) signal.Notify(stop, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM) @@ -241,13 +241,13 @@ func resyncIndex() error { return nil } - var header *bitcoin.BlockHeader + var header *bchain.BlockHeader if local != "" { // Is local tip on the best chain? header, err = chain.GetBlockHeader(local) forked := false if err != nil { - if e, ok := err.(*bitcoin.RPCError); ok && e.Message == "Block not found" { + if e, ok := err.(*bchain.RPCError); ok && e.Message == "Block not found" { forked = true } else { return err @@ -378,7 +378,7 @@ func connectBlocksParallel( } err := connectBlockChunk(low, high) if err != nil { - if e, ok := err.(*bitcoin.RPCError); ok && (e.Message == "Block height out of range" || e.Message == "Block not found") { + if e, ok := err.(*bchain.RPCError); ok && (e.Message == "Block height out of range" || e.Message == "Block not found") { break } glog.Fatalf("connectBlocksParallel %d-%d %v", low, high, err) @@ -401,7 +401,7 @@ func connectBlockChunk( connected, err := isBlockConnected(higher) if err != nil || connected { // if higher is over the best block, continue with lower block, otherwise return error - if e, ok := err.(*bitcoin.RPCError); !ok || e.Message != "Block height out of range" { + if e, ok := err.(*bchain.RPCError); !ok || e.Message != "Block height out of range" { return err } } @@ -452,7 +452,7 @@ func isBlockConnected( } type blockResult struct { - block *bitcoin.Block + block *bchain.Block err error } diff --git a/db/rocksdb.go b/db/rocksdb.go index 21d5f6cc..446697ae 100644 --- a/db/rocksdb.go +++ b/db/rocksdb.go @@ -1,7 +1,7 @@ package db import ( - "blockbook/bitcoin" + "blockbook/bchain" "bytes" "encoding/binary" "encoding/hex" @@ -151,15 +151,15 @@ const ( opDelete = 1 ) -func (d *RocksDB) ConnectBlock(block *bitcoin.Block) error { +func (d *RocksDB) ConnectBlock(block *bchain.Block) error { return d.writeBlock(block, opInsert) } -func (d *RocksDB) DisconnectBlock(block *bitcoin.Block) error { +func (d *RocksDB) DisconnectBlock(block *bchain.Block) error { return d.writeBlock(block, opDelete) } -func (d *RocksDB) writeBlock(block *bitcoin.Block, op int) error { +func (d *RocksDB) writeBlock(block *bchain.Block, op int) error { wb := gorocksdb.NewWriteBatch() defer wb.Destroy() @@ -194,7 +194,7 @@ type outpoint struct { func (d *RocksDB) writeOutputs( wb *gorocksdb.WriteBatch, - block *bitcoin.Block, + block *bchain.Block, op int, ) error { records := make(map[string][]outpoint) @@ -283,7 +283,7 @@ func unpackOutputValue(buf []byte) ([]outpoint, error) { func (d *RocksDB) writeInputs( wb *gorocksdb.WriteBatch, - block *bitcoin.Block, + block *bchain.Block, op int, ) error { for _, tx := range block.Txs { @@ -361,7 +361,7 @@ func (d *RocksDB) getInput(key []byte) ([]byte, error) { func (d *RocksDB) writeHeight( wb *gorocksdb.WriteBatch, - block *bitcoin.Block, + block *bchain.Block, op int, ) error { key := packUint(block.Height) diff --git a/server/https.go b/server/https.go index 82512ec5..22ac5279 100644 --- a/server/https.go +++ b/server/https.go @@ -1,7 +1,7 @@ package server import ( - "blockbook/bitcoin" + "blockbook/bchain" "blockbook/db" "context" "encoding/json" @@ -131,7 +131,7 @@ func (s *HttpServer) transactions(w http.ResponseWriter, r *http.Request) { if err != nil { respondError(w, err, fmt.Sprintf("address %s", address)) } - script, err := bitcoin.AddressToOutputScript(address) + script, err := bchain.AddressToOutputScript(address) if err != nil { respondError(w, err, fmt.Sprintf("address %s", address)) }