From 68575b2786f7f0e0ab2e3bdacc439bad37ac8e11 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Thu, 21 Mar 2019 22:53:48 +0100 Subject: [PATCH] Fix linter issues --- bchain/coins/btg/bgoldparser.go | 4 ++++ bchain/coins/btg/bgoldrpc.go | 2 +- bchain/coins/digibyte/digibyteparser.go | 2 ++ bchain/coins/fujicoin/fujicoinparser.go | 5 +++++ bchain/coins/liquid/liquidparser.go | 2 ++ bchain/coins/namecoin/namecoinparser.go | 2 ++ bchain/coins/qtum/qtumparser.go | 6 +++++- contrib/scripts/check-and-generate-port-registry.go | 3 +++ 8 files changed, 24 insertions(+), 2 deletions(-) diff --git a/bchain/coins/btg/bgoldparser.go b/bchain/coins/btg/bgoldparser.go index d21a2575..13a98672 100644 --- a/bchain/coins/btg/bgoldparser.go +++ b/bchain/coins/btg/bgoldparser.go @@ -14,12 +14,16 @@ import ( ) const ( + // MainnetMagic is mainnet network constant MainnetMagic wire.BitcoinNet = 0x446d47e1 + // TestnetMagic is testnet network constant TestnetMagic wire.BitcoinNet = 0x456e48e2 ) var ( + // MainNetParams are parser parameters for mainnet MainNetParams chaincfg.Params + // TestNetParams are parser parameters for testnet TestNetParams chaincfg.Params ) diff --git a/bchain/coins/btg/bgoldrpc.go b/bchain/coins/btg/bgoldrpc.go index 4de00487..b158ba32 100644 --- a/bchain/coins/btg/bgoldrpc.go +++ b/bchain/coins/btg/bgoldrpc.go @@ -13,7 +13,7 @@ type BGoldRPC struct { *btc.BitcoinRPC } -// NewBCashRPC returns new BGoldRPC instance. +// NewBGoldRPC returns new BGoldRPC instance. func NewBGoldRPC(config json.RawMessage, pushHandler func(bchain.NotificationType)) (bchain.BlockChain, error) { b, err := btc.NewBitcoinRPC(config, pushHandler) if err != nil { diff --git a/bchain/coins/digibyte/digibyteparser.go b/bchain/coins/digibyte/digibyteparser.go index c374958a..09d5edc9 100644 --- a/bchain/coins/digibyte/digibyteparser.go +++ b/bchain/coins/digibyte/digibyteparser.go @@ -8,10 +8,12 @@ import ( ) const ( + // MainnetMagic is mainnet network constant MainnetMagic wire.BitcoinNet = 0xdab6c3fa ) var ( + // MainNetParams are parser parameters for mainnet MainNetParams chaincfg.Params ) diff --git a/bchain/coins/fujicoin/fujicoinparser.go b/bchain/coins/fujicoin/fujicoinparser.go index 3b66c86f..8f2aa999 100644 --- a/bchain/coins/fujicoin/fujicoinparser.go +++ b/bchain/coins/fujicoin/fujicoinparser.go @@ -8,13 +8,18 @@ import ( ) const ( + // MainnetMagic is mainnet network constant MainnetMagic wire.BitcoinNet = 0x696a7566 + // TestnetMagic is testnet network constant TestnetMagic wire.BitcoinNet = 0x66756a69 + // RegtestMagic is regtest network constant RegtestMagic wire.BitcoinNet = 0x66756a69 ) var ( + // MainNetParams are parser parameters for mainnet MainNetParams chaincfg.Params + // TestNetParams are parser parameters for testnet TestNetParams chaincfg.Params ) diff --git a/bchain/coins/liquid/liquidparser.go b/bchain/coins/liquid/liquidparser.go index 926a7c6c..1a53feee 100644 --- a/bchain/coins/liquid/liquidparser.go +++ b/bchain/coins/liquid/liquidparser.go @@ -14,10 +14,12 @@ import ( ) const ( + // MainnetMagic is mainnet network constant MainnetMagic wire.BitcoinNet = 0xdab5bffa ) var ( + // MainNetParams are parser parameters for mainnet MainNetParams chaincfg.Params ) diff --git a/bchain/coins/namecoin/namecoinparser.go b/bchain/coins/namecoin/namecoinparser.go index 261afefc..cff9122f 100644 --- a/bchain/coins/namecoin/namecoinparser.go +++ b/bchain/coins/namecoin/namecoinparser.go @@ -11,10 +11,12 @@ import ( ) const ( + // MainnetMagic is mainnet network constant MainnetMagic wire.BitcoinNet = 0xfeb4bef9 ) var ( + // MainNetParams are parser parameters for mainnet MainNetParams chaincfg.Params ) diff --git a/bchain/coins/qtum/qtumparser.go b/bchain/coins/qtum/qtumparser.go index 701fac47..29c163f8 100644 --- a/bchain/coins/qtum/qtumparser.go +++ b/bchain/coins/qtum/qtumparser.go @@ -6,9 +6,10 @@ import ( "blockbook/bchain/coins/utils" "bytes" "encoding/json" + "io" + "github.com/martinboehm/btcd/wire" "github.com/martinboehm/btcutil/chaincfg" - "io" ) const ( @@ -71,6 +72,9 @@ func GetChainParams(chain string) *chaincfg.Params { func parseBlockHeader(r io.Reader) (*wire.BlockHeader, error) { h := &wire.BlockHeader{} err := h.Deserialize(r) + if err != nil { + return nil, err + } // hash_state_root 32 // hash_utxo_root 32 diff --git a/contrib/scripts/check-and-generate-port-registry.go b/contrib/scripts/check-and-generate-port-registry.go index 9fcedcb1..048a28f3 100755 --- a/contrib/scripts/check-and-generate-port-registry.go +++ b/contrib/scripts/check-and-generate-port-registry.go @@ -19,6 +19,7 @@ const ( outputFile = "docs/ports.md" ) +// PortInfo contains backend and blockbook ports type PortInfo struct { CoinName string BlockbookInternalPort uint16 @@ -27,8 +28,10 @@ type PortInfo struct { BackendServicePorts map[string]uint16 } +// PortInfoSlice is self describing type PortInfoSlice []*PortInfo +// Config contains coin configuration type Config struct { Coin struct { Name string `json:"name"`