RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename package bitcoin to bchain

Browse Source
This commit is contained in:
Martin Boehm 2018-01-31 15:23:17 +01:00
parent 41c6ed8b6f
commit a403b8d0fe
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/bitcoinrpc.go → bchain/bitcoinrpc.go
View File

@ -1,4 +1,4 @@
package bitcoin
package bchain
import (
"bytes"

2
bitcoin/bitcoinwire.go → bchain/bitcoinwire.go
View File

@ -1,4 +1,4 @@
package bitcoin
package bchain
import (
"bytes"

4
bitcoin/mq.go → bchain/mq.go
View File

@ -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

2
bitcoin/types.go → bchain/types.go
View File

@ -1,4 +1,4 @@
package bitcoin
package bchain
import (
"github.com/btcsuite/btcd/txscript"

30
blockbook.go
View File

@ -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
}

14
db/rocksdb.go
View File

@ -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)

4
server/https.go
View File

@ -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))
}