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

Remove unnecessary methods from BlockChainParser interface

Browse Source
This commit is contained in:
Martin Boehm 2018-03-23 13:15:19 +01:00
parent dda80bd074
commit 32a2c1a417
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bchain/coins/btc/bitcoinparser.go
View File

@ -33,22 +33,14 @@ func GetChainParams(chain string) *chaincfg.Params {
return &chaincfg.MainNetParams return &chaincfg.MainNetParams
} }
func (p *BitcoinBlockParser) GetAddrIDFromVout(output *bchain.Vout) string { func (p *BitcoinBlockParser) GetAddrIDFromVout(output *bchain.Vout) ([]byte, error) {
return output.ScriptPubKey.Hex return hex.DecodeString(output.ScriptPubKey.Hex)
} }
func (p *BitcoinBlockParser) GetAddrIDFromAddress(address string) ([]byte, error) { func (p *BitcoinBlockParser) GetAddrIDFromAddress(address string) ([]byte, error) {
return p.AddressToOutputScript(address) return p.AddressToOutputScript(address)
} }
func (p *BitcoinBlockParser) PackAddrID(str string) ([]byte, error) {
return hex.DecodeString(str)
}
func (p *BitcoinBlockParser) UnpackAddrID(buf []byte) string {
return hex.EncodeToString(buf)
}
// AddressToOutputScript converts bitcoin address to ScriptPubKey // AddressToOutputScript converts bitcoin address to ScriptPubKey
func (p *BitcoinBlockParser) AddressToOutputScript(address string) ([]byte, error) { func (p *BitcoinBlockParser) AddressToOutputScript(address string) ([]byte, error) {
da, err := btcutil.DecodeAddress(address, p.Params) da, err := btcutil.DecodeAddress(address, p.Params)

16
bchain/coins/zec/zcashparser.go
View File

@ -26,21 +26,13 @@ func GetChainParams(chain string) *chaincfg.Params {
return &chaincfg.MainNetParams return &chaincfg.MainNetParams
} }
func (p *ZCashBlockParser) GetAddrIDFromVout(output *bchain.Vout) string { func (p *ZCashBlockParser) GetAddrIDFromVout(output *bchain.Vout) ([]byte, error) {
if len(output.ScriptPubKey.Addresses) != 1 { if len(output.ScriptPubKey.Addresses) != 1 {
return "" return nil, nil
} }
return output.ScriptPubKey.Addresses[0] return []byte(output.ScriptPubKey.Addresses[0]), nil
} }
func (p *ZCashBlockParser) GetAddrIDFromAddress(address string) ([]byte, error) { func (p *ZCashBlockParser) GetAddrIDFromAddress(address string) ([]byte, error) {
return p.PackAddrID(address) return []byte(address), nil
}
func (p *ZCashBlockParser) PackAddrID(str string) ([]byte, error) {
return []byte(str), nil
}
func (p *ZCashBlockParser) UnpackAddrID(buf []byte) string {
return string(buf)
} }

4
bchain/types.go
View File

@ -117,10 +117,8 @@ type BlockChainParser interface {
// non UTXO chains have mapping of address to input and output transactions directly in "outputs" column in db // non UTXO chains have mapping of address to input and output transactions directly in "outputs" column in db
IsUTXOChain() bool IsUTXOChain() bool
// address id conversions // address id conversions
GetAddrIDFromVout(output *Vout) string GetAddrIDFromVout(output *Vout) ([]byte, error)
GetAddrIDFromAddress(address string) ([]byte, error) GetAddrIDFromAddress(address string) ([]byte, error)
PackAddrID(addrID string) ([]byte, error)
UnpackAddrID(buf []byte) string
// address to output script conversions // address to output script conversions
AddressToOutputScript(address string) ([]byte, error) AddressToOutputScript(address string) ([]byte, error)
OutputScriptToAddresses(script []byte) ([]string, error) OutputScriptToAddresses(script []byte) ([]string, error)