From a282cde045138f29bd244e7015b3b88e8772030f Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Sun, 6 Mar 2022 21:27:52 +0100 Subject: [PATCH] Fix format --- bchain/coins/bch/bcashrpc.go | 6 +++--- bchain/coins/btc/bitcoinrpc.go | 6 +++--- bchain/coins/firo/firorpc.go | 6 +++--- bchain/coins/grs/grsparser.go | 4 ++-- bchain/coins/zec/zcashrpc.go | 1 - tests/dbtestdata/fakechain.go | 1 - 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/bchain/coins/bch/bcashrpc.go b/bchain/coins/bch/bcashrpc.go index b06fd6bb..2a36a760 100644 --- a/bchain/coins/bch/bcashrpc.go +++ b/bchain/coins/bch/bcashrpc.go @@ -129,14 +129,14 @@ func (b *BCashRPC) GetBlockRaw(hash string) (string, error) { } return "", errors.Annotatef(res.Error, "hash %v", hash) } - return res.Result,nil + return res.Result, nil } // GetBlockBytes returns block with given hash as bytes func (b *BCashRPC) GetBlockBytes(hash string) ([]byte, error) { - block,err:=b.GetBlockRaw(hash) + block, err := b.GetBlockRaw(hash) if err != nil { - return nil,err + return nil, err } return hex.DecodeString(block) } diff --git a/bchain/coins/btc/bitcoinrpc.go b/bchain/coins/btc/bitcoinrpc.go index 0a0cca97..db75ce81 100644 --- a/bchain/coins/btc/bitcoinrpc.go +++ b/bchain/coins/btc/bitcoinrpc.go @@ -620,14 +620,14 @@ func (b *BitcoinRPC) GetBlockRaw(hash string) (string, error) { } return "", errors.Annotatef(res.Error, "hash %v", hash) } - return res.Result,nil + return res.Result, nil } // GetBlockBytes returns block with given hash as bytes func (b *BitcoinRPC) GetBlockBytes(hash string) ([]byte, error) { - block,err:=b.GetBlockRaw(hash) + block, err := b.GetBlockRaw(hash) if err != nil { - return nil,err + return nil, err } return hex.DecodeString(block) } diff --git a/bchain/coins/firo/firorpc.go b/bchain/coins/firo/firorpc.go index 67a19287..6a9debd4 100644 --- a/bchain/coins/firo/firorpc.go +++ b/bchain/coins/firo/firorpc.go @@ -153,14 +153,14 @@ func (zc *FiroRPC) GetBlockRaw(hash string) (string, error) { } return "", errors.Annotatef(res.Error, "hash %v", hash) } - return res.Result,nil + return res.Result, nil } // GetBlockBytes returns block with given hash as bytes func (zc *FiroRPC) GetBlockBytes(hash string) ([]byte, error) { - block,err:=zc.GetBlockRaw(hash) + block, err := zc.GetBlockRaw(hash) if err != nil { - return nil,err + return nil, err } return hex.DecodeString(block) } diff --git a/bchain/coins/grs/grsparser.go b/bchain/coins/grs/grsparser.go index eef9d05c..556fb8d8 100644 --- a/bchain/coins/grs/grsparser.go +++ b/bchain/coins/grs/grsparser.go @@ -13,7 +13,7 @@ const ( MainnetMagic wire.BitcoinNet = 0xd4b4bef9 TestnetMagic wire.BitcoinNet = 0x0709110b RegtestMagic wire.BitcoinNet = 0xdab5bffa - SignetMagic wire.BitcoinNet = 0x7696b422 + SignetMagic wire.BitcoinNet = 0x7696b422 ) // chain parameters @@ -21,7 +21,7 @@ var ( MainNetParams chaincfg.Params TestNetParams chaincfg.Params RegTestParams chaincfg.Params - SigNetParams chaincfg.Params + SigNetParams chaincfg.Params ) func init() { diff --git a/bchain/coins/zec/zcashrpc.go b/bchain/coins/zec/zcashrpc.go index 3c740d16..c7f40566 100644 --- a/bchain/coins/zec/zcashrpc.go +++ b/bchain/coins/zec/zcashrpc.go @@ -168,4 +168,3 @@ func (z *ZCashRPC) GetMempoolEntry(txid string) (*bchain.MempoolEntry, error) { func (z *ZCashRPC) GetBlockRaw(hash string) (string, error) { return "", errors.New("GetBlockRaw: not supported") } - diff --git a/tests/dbtestdata/fakechain.go b/tests/dbtestdata/fakechain.go index a20fdd40..8e37feb6 100644 --- a/tests/dbtestdata/fakechain.go +++ b/tests/dbtestdata/fakechain.go @@ -140,7 +140,6 @@ func (c *fakeBlockChain) GetBlockRaw(hash string) (string, error) { return "00e0ff3fd42677a86f1515bafcf9802c1765e02226655a9b97fd44132602000000000000", nil } - func (c *fakeBlockChain) GetTransaction(txid string) (v *bchain.Tx, err error) { v = getTxInBlock(GetTestBitcoinTypeBlock1(c.Parser), txid) if v == nil {