From 3a8da677523e2a399435fbb287bc8f2743755758 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Wed, 21 Aug 2019 23:11:50 +0200 Subject: [PATCH] Fix linting errors --- api/worker.go | 2 +- bchain/coins/dcr/decredparser.go | 1 + bchain/coins/dcr/decredrpc.go | 12 +++--------- bchain/coins/divi/diviparser_test.go | 2 +- bchain/coins/koto/kotoparser.go | 2 ++ bchain/coins/pivx/pivxparser.go | 5 +++-- bchain/coins/viacoin/viacoinparser.go | 3 +++ bchain/coins/xzc/zcoinparser.go | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/api/worker.go b/api/worker.go index 3b55bfb5..786c2920 100644 --- a/api/worker.go +++ b/api/worker.go @@ -1047,7 +1047,7 @@ func (w *Worker) GetFeeStats(bid string) (*FeeStats, error) { return nil, errors.Annotatef(err, "GetTxAddresses") } - // Caclulate total fees in Satoshis + // Calculate total fees in Satoshis feeSat := big.NewInt(0) for _, input := range txAddresses.Inputs { feeSat = feeSat.Add(&input.ValueSat, feeSat) diff --git a/bchain/coins/dcr/decredparser.go b/bchain/coins/dcr/decredparser.go index 8174a9e0..3f1096ef 100644 --- a/bchain/coins/dcr/decredparser.go +++ b/bchain/coins/dcr/decredparser.go @@ -125,6 +125,7 @@ func (p *DecredParser) ParseBlock(b []byte) (*bchain.Block, error) { }, nil } +// ParseTxFromJson parses JSON message containing transaction and returns Tx struct func (p *DecredParser) ParseTxFromJson(jsonTx json.RawMessage) (*bchain.Tx, error) { var getTxResult GetTransactionResult if err := json.Unmarshal([]byte(jsonTx), &getTxResult.Result); err != nil { diff --git a/bchain/coins/dcr/decredrpc.go b/bchain/coins/dcr/decredrpc.go index 60cd1474..1f93a692 100644 --- a/bchain/coins/dcr/decredrpc.go +++ b/bchain/coins/dcr/decredrpc.go @@ -491,11 +491,7 @@ func (d *DecredRPC) GetBlockHeader(hash string) (*bchain.BlockHeader, error) { return header, nil } -func (d *DecredRPC) GetBlockHeaderByHeight(height uint32) (*bchain.BlockHeader, error) { - return nil, nil -} - -// GetBlock returns the block retreived using the provided block hash by default +// GetBlock returns the block retrieved using the provided block hash by default // or using the block height if an empty hash string was provided. If the // requested block has less than 2 confirmation bchain.ErrBlockNotFound error // is returned. This rule is in places to guarrantee that only validated block @@ -503,18 +499,16 @@ func (d *DecredRPC) GetBlockHeaderByHeight(height uint32) (*bchain.BlockHeader, func (d *DecredRPC) GetBlock(hash string, height uint32) (*bchain.Block, error) { // Confirm if the block at provided height has at least 2 confirming blocks. d.mtx.Lock() - var bestBlockHeight = d.bestBlock - if height > bestBlockHeight { + if height > d.bestBlock { bestBlock, err := d.getBestBlock() if err != nil || height > bestBlock.Result.Height { - // If an error occured or the current height doesn't have a minimum + // If an error occurred or the current height doesn't have a minimum // of two confirming blocks (greater than best block), quit. d.mtx.Unlock() return nil, bchain.ErrBlockNotFound } d.bestBlock = bestBlock.Result.Height - bestBlockHeight = bestBlock.Result.Height } d.mtx.Unlock() // Releases the lock soonest possible diff --git a/bchain/coins/divi/diviparser_test.go b/bchain/coins/divi/diviparser_test.go index 3250f226..3fc06efd 100755 --- a/bchain/coins/divi/diviparser_test.go +++ b/bchain/coins/divi/diviparser_test.go @@ -291,7 +291,7 @@ func Test_UnpackTx(t *testing.T) { type testBlock struct { size int time int64 - tx []string + tx []string } var testParseBlockTxs = map[int]testBlock{ diff --git a/bchain/coins/koto/kotoparser.go b/bchain/coins/koto/kotoparser.go index e84a220f..570b2cb7 100644 --- a/bchain/coins/koto/kotoparser.go +++ b/bchain/coins/koto/kotoparser.go @@ -8,12 +8,14 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0x6f746f4b TestnetMagic wire.BitcoinNet = 0x6f6b6f54 RegtestMagic wire.BitcoinNet = 0x6f6b6552 ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params diff --git a/bchain/coins/pivx/pivxparser.go b/bchain/coins/pivx/pivxparser.go index 42bf365a..a854d247 100644 --- a/bchain/coins/pivx/pivxparser.go +++ b/bchain/coins/pivx/pivxparser.go @@ -19,8 +19,8 @@ import ( "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( - // Net Magics MainnetMagic wire.BitcoinNet = 0xe9fdc490 TestnetMagic wire.BitcoinNet = 0xba657645 @@ -29,6 +29,7 @@ const ( OP_ZEROCOINSPEND = 0xc2 ) +// chain parameters var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params @@ -143,7 +144,7 @@ func (p *PivXParser) ParseTx(b []byte) (*bchain.Tx, error) { return &tx, nil } -// Parses tx and adds handling for OP_ZEROCOINSPEND inputs +// TxFromMsgTx parses tx and adds handling for OP_ZEROCOINSPEND inputs func (p *PivXParser) TxFromMsgTx(t *wire.MsgTx, parseAddresses bool) bchain.Tx { vin := make([]bchain.Vin, len(t.TxIn)) for i, in := range t.TxIn { diff --git a/bchain/coins/viacoin/viacoinparser.go b/bchain/coins/viacoin/viacoinparser.go index cd8ea879..d0583ecd 100644 --- a/bchain/coins/viacoin/viacoinparser.go +++ b/bchain/coins/viacoin/viacoinparser.go @@ -5,15 +5,18 @@ import ( "blockbook/bchain/coins/btc" "blockbook/bchain/coins/utils" "bytes" + "github.com/martinboehm/btcd/wire" "github.com/martinboehm/btcutil/chaincfg" ) +// magic numbers const ( MainnetMagic wire.BitcoinNet = 0xcbc6680f RegtestMagic wire.BitcoinNet = 0x377b972d ) +// chain parameters var ( MainNetParams chaincfg.Params RegtestParams chaincfg.Params diff --git a/bchain/coins/xzc/zcoinparser.go b/bchain/coins/xzc/zcoinparser.go index 6a67bae6..00663dfb 100644 --- a/bchain/coins/xzc/zcoinparser.go +++ b/bchain/coins/xzc/zcoinparser.go @@ -16,8 +16,8 @@ import ( const ( OpZeroCoinMint = 0xc1 OpZeroCoinSpend = 0xc2 - OpSigmaMint = 0xc3 - OpSigmaSpend = 0xc4 + OpSigmaMint = 0xc3 + OpSigmaSpend = 0xc4 MainnetMagic wire.BitcoinNet = 0xe3d9fef1 TestnetMagic wire.BitcoinNet = 0xcffcbeea