From 480523a2b34492e95ec1db8606313c5be0d70120 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Tue, 11 Jun 2019 17:22:24 +0200 Subject: [PATCH] Fix linting issues --- bchain/coins/flo/floparser.go | 3 +++ bchain/coins/koto/kotorpc.go | 2 ++ bchain/coins/monacoin/monacoinparser.go | 2 ++ bchain/coins/myriad/myriadparser.go | 2 ++ bchain/coins/nuls/nulsparser_test.go | 15 ++++++++------- bchain/coins/ravencoin/ravencoinparser.go | 2 ++ bchain/coins/ritocoin/ritocoinparser.go | 2 ++ bchain/coins/viacoin/viacoinrpc.go | 2 +- bchain/coins/vipstarcoin/vipstarcoinparser.go | 3 +++ 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/bchain/coins/flo/floparser.go b/bchain/coins/flo/floparser.go index 68e75d63..ec50139f 100644 --- a/bchain/coins/flo/floparser.go +++ b/bchain/coins/flo/floparser.go @@ -3,16 +3,19 @@ package flo import ( "blockbook/bchain" "blockbook/bchain/coins/btc" + "github.com/martinboehm/btcd/wire" "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0xf1a5c0fd TestnetMagic wire.BitcoinNet = 0xf25ac0fd RegtestMagic wire.BitcoinNet = 0xdab5bffa ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params diff --git a/bchain/coins/koto/kotorpc.go b/bchain/coins/koto/kotorpc.go index 5dc87295..95624476 100644 --- a/bchain/coins/koto/kotorpc.go +++ b/bchain/coins/koto/kotorpc.go @@ -9,10 +9,12 @@ import ( "github.com/juju/errors" ) +// KotoRPC is an interface to JSON-RPC bitcoind service type KotoRPC struct { *btc.BitcoinRPC } +// NewKotoRPC returns new LitecoinRPC instance func NewKotoRPC(config json.RawMessage, pushHandler func(bchain.NotificationType)) (bchain.BlockChain, error) { b, err := btc.NewBitcoinRPC(config, pushHandler) if err != nil { diff --git a/bchain/coins/monacoin/monacoinparser.go b/bchain/coins/monacoin/monacoinparser.go index 47cd72ed..08056def 100644 --- a/bchain/coins/monacoin/monacoinparser.go +++ b/bchain/coins/monacoin/monacoinparser.go @@ -7,11 +7,13 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0xdbb6c0fb TestnetMagic wire.BitcoinNet = 0xf1c8d2fd ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params diff --git a/bchain/coins/myriad/myriadparser.go b/bchain/coins/myriad/myriadparser.go index deac7509..ba2d62a2 100644 --- a/bchain/coins/myriad/myriadparser.go +++ b/bchain/coins/myriad/myriadparser.go @@ -10,10 +10,12 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0xee7645af ) +// chain parameters var ( MainNetParams chaincfg.Params ) diff --git a/bchain/coins/nuls/nulsparser_test.go b/bchain/coins/nuls/nulsparser_test.go index d87686ed..e09948c4 100644 --- a/bchain/coins/nuls/nulsparser_test.go +++ b/bchain/coins/nuls/nulsparser_test.go @@ -5,11 +5,12 @@ import ( "blockbook/bchain/coins/btc" "encoding/hex" "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/martinboehm/btcutil/hdkeychain" "math/big" "reflect" "testing" + + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/martinboehm/btcutil/hdkeychain" ) var ( @@ -362,7 +363,7 @@ func TestDeriveAddressDescriptorsFromTo(t *testing.T) { return } - key1, err := changeExtKey.Child(0) + key1, _ := changeExtKey.Child(0) priKey1, _ := key1.ECPrivKey() wantPriKey1 := "0x995c98115809359eb57a5e179558faddd55ef88f88e5cf58617a5f9f3d6bb3a1" if !reflect.DeepEqual(hexutil.MustDecode(wantPriKey1), priKey1.Serialize()) { @@ -376,7 +377,7 @@ func TestDeriveAddressDescriptorsFromTo(t *testing.T) { return } - key2, err := changeExtKey.Child(1) + key2, _ := changeExtKey.Child(1) priKey2, _ := key2.ECPrivKey() wantPriKey2 := "0x0f65dee42d3c974c1a4bcc79f141be89715dc8d6406faa9ad4f1f55ca95fabc8" if !reflect.DeepEqual(hexutil.MustDecode(wantPriKey2), priKey2.Serialize()) { @@ -390,7 +391,7 @@ func TestDeriveAddressDescriptorsFromTo(t *testing.T) { return } - key3, err := changeExtKey.Child(2) + key3, _ := changeExtKey.Child(2) priKey3, _ := key3.ECPrivKey() wantPriKey3 := "0x6fd98d1d9c3f3ac1ff61bbf3f20e89f00ffa8d43a554f2a7d73fd464b6666f45" if !reflect.DeepEqual(hexutil.MustDecode(wantPriKey3), priKey3.Serialize()) { @@ -404,7 +405,7 @@ func TestDeriveAddressDescriptorsFromTo(t *testing.T) { return } - key4, err := changeExtKey.Child(3) + key4, _ := changeExtKey.Child(3) priKey4, _ := key4.ECPrivKey() wantPriKey4 := "0x21412d9e33aba493faf4bc7d408ed5290bea5b36a7beec554b858051f8d4bff3" if !reflect.DeepEqual(hexutil.MustDecode(wantPriKey4), priKey4.Serialize()) { @@ -418,7 +419,7 @@ func TestDeriveAddressDescriptorsFromTo(t *testing.T) { return } - key5, err := changeExtKey.Child(4) + key5, _ := changeExtKey.Child(4) priKey5, _ := key5.ECPrivKey() wantPriKey5 := "0xdc3d290e32a4e0f38bc26c25a78ceb1c8779110883d9cb0be54629043c1f8724" if !reflect.DeepEqual(hexutil.MustDecode(wantPriKey5), priKey5.Serialize()) { diff --git a/bchain/coins/ravencoin/ravencoinparser.go b/bchain/coins/ravencoin/ravencoinparser.go index a3f5510d..f873d562 100644 --- a/bchain/coins/ravencoin/ravencoinparser.go +++ b/bchain/coins/ravencoin/ravencoinparser.go @@ -10,11 +10,13 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0x4e564152 TestnetMagic wire.BitcoinNet = 0x544e5652 ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params diff --git a/bchain/coins/ritocoin/ritocoinparser.go b/bchain/coins/ritocoin/ritocoinparser.go index 83fcb8fd..60f081fe 100644 --- a/bchain/coins/ritocoin/ritocoinparser.go +++ b/bchain/coins/ritocoin/ritocoinparser.go @@ -10,11 +10,13 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0x2a7bc0a1 TestnetMagic wire.BitcoinNet = 0x514E5352 ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params diff --git a/bchain/coins/viacoin/viacoinrpc.go b/bchain/coins/viacoin/viacoinrpc.go index 877a987c..6a5f4c21 100644 --- a/bchain/coins/viacoin/viacoinrpc.go +++ b/bchain/coins/viacoin/viacoinrpc.go @@ -4,11 +4,11 @@ import ( "blockbook/bchain" "blockbook/bchain/coins/btc" "encoding/json" + "github.com/golang/glog" ) // ViacoinRPC is an interface to JSON-RPC bitcoind service - type ViacoinRPC struct { *btc.BitcoinRPC } diff --git a/bchain/coins/vipstarcoin/vipstarcoinparser.go b/bchain/coins/vipstarcoin/vipstarcoinparser.go index 2deed4ac..bfeadd27 100644 --- a/bchain/coins/vipstarcoin/vipstarcoinparser.go +++ b/bchain/coins/vipstarcoin/vipstarcoinparser.go @@ -12,11 +12,13 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0x012ce7b5 TestnetMagic wire.BitcoinNet = 0x1a2b3c4d ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params @@ -96,6 +98,7 @@ func parseBlockHeader(r io.Reader) (*wire.BlockHeader, error) { return h, err } +// ParseBlock parses block from byte array func (p *VIPSTARCOINParser) ParseBlock(b []byte) (*bchain.Block, error) { r := bytes.NewReader(b) w := wire.MsgBlock{}