GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-13 12:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

staticaddr: move address.Parameters to script package

Browse source 
The Parameters struct describes the keys, expiry and pkScript that
define the static address script, so its natural home is the script
package. Moving it there lets staticutil drop its dependency on the
address package and lets callers reuse a single type alongside
script.StaticAddress and script.NewStaticAddress.

No behavior change.

Closes #1056
This commit is contained in:
0xfandom 2026-05-01 15:54:37 +05:30
parent 62177f9d62
commit 8b89f77529
17 changed files with 81 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

13
loopd/swapclient_server_test.go
View file

@ -19,6 +19,7 @@ import (
"github.com/lightninglabs/loop/looprpc"
"github.com/lightninglabs/loop/staticaddr/address"
"github.com/lightninglabs/loop/staticaddr/deposit"
"github.com/lightninglabs/loop/staticaddr/script"
"github.com/lightninglabs/loop/swap"
mock_lnd "github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/lntypes"
@ -947,18 +948,18 @@ func TestListSwapsFilterAndPagination(t *testing.T) {
// mockAddressStore is a minimal in-memory store for address parameters.
type mockAddressStore struct {
params []*address.Parameters
params []*script.Parameters
}
func (s *mockAddressStore) CreateStaticAddress(_ context.Context,
p *address.Parameters) error {
p *script.Parameters) error {
s.params = append(s.params, p)
return nil
}
func (s *mockAddressStore) GetStaticAddress(_ context.Context, _ []byte) (
*address.Parameters, error) {
*script.Parameters, error) {
if len(s.params) == 0 {
return nil, nil
@ -968,7 +969,7 @@ func (s *mockAddressStore) GetStaticAddress(_ context.Context, _ []byte) (
}
func (s *mockAddressStore) GetAllStaticAddresses(_ context.Context) (
[]*address.Parameters, error) {
[]*script.Parameters, error) {
return s.params, nil
}
@ -1019,14 +1020,14 @@ func TestListUnspentDeposits(t *testing.T) {
_, client := mock_lnd.CreateKey(1)
_, server := mock_lnd.CreateKey(2)
pkScript := []byte("pkscript")
addrParams := &address.Parameters{
addrParams := &script.Parameters{
ClientPubkey: client,
ServerPubkey: server,
Expiry: 10,
PkScript: pkScript,
}
addrStore := &mockAddressStore{params: []*address.Parameters{addrParams}}
addrStore := &mockAddressStore{params: []*script.Parameters{addrParams}}
// Build an address manager using our mock lnd and fake address store.
addrMgr, err := address.NewManager(&address.ManagerConfig{