Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-10-14 00:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DEV-14] Removed remaining Segwit code

Browse Source
This commit is contained in:
Mike Zak 2018-06-13 12:14:42 +03:00
parent ca5100b459
commit c66fb13c2a
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration/bip0009_test.go
View File

@ -299,7 +299,6 @@ func TestBIP0009(t *testing.T) {
t.Parallel() t.Parallel()
testBIP0009(t, "dummy", chaincfg.DeploymentTestDummy) testBIP0009(t, "dummy", chaincfg.DeploymentTestDummy)
testBIP0009(t, "segwit", chaincfg.DeploymentSegwit)
} }
// TestBIP0009Mining ensures blocks built via btcd's CPU miner follow the rules // TestBIP0009Mining ensures blocks built via btcd's CPU miner follow the rules

22
rpcclient/wallet.go
View File

@ -943,28 +943,6 @@ func (c *Client) GetRawChangeAddress(account string) (btcutil.Address, error) {
return c.GetRawChangeAddressAsync(account).Receive() return c.GetRawChangeAddressAsync(account).Receive()
} }
// FutureAddWitnessAddressResult is a future promise to deliver the result of
// a AddWitnessAddressAsync RPC invocation (or an applicable error).
type FutureAddWitnessAddressResult chan *response
// Receive waits for the response promised by the future and returns the new
// address.
func (r FutureAddWitnessAddressResult) Receive() (btcutil.Address, error) {
res, err := receiveFuture(r)
if err != nil {
return nil, err
}
// Unmarshal result as a string.
var addr string
err = json.Unmarshal(res, &addr)
if err != nil {
return nil, err
}
return btcutil.DecodeAddress(addr, &chaincfg.MainNetParams)
}
// FutureGetAccountAddressResult is a future promise to deliver the result of a // FutureGetAccountAddressResult is a future promise to deliver the result of a
// GetAccountAddressAsync RPC invocation (or an applicable error). // GetAccountAddressAsync RPC invocation (or an applicable error).
type FutureGetAccountAddressResult chan *response type FutureGetAccountAddressResult chan *response