akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2206 from halseth/channel-commitchainheight-remove

Browse Source 
[trivial] lnwallet/channel: remove startingHeight from commitmenChain
This commit is contained in:
Olaoluwa Osuntokun 2018-11-24 15:27:54 -06:00 committed by GitHub
commit 8924d8fb20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lnwallet/channel.go
View File

@ -1023,11 +1023,10 @@ type commitmentChain struct {
startingHeight uint64 startingHeight uint64
} }
// newCommitmentChain creates a new commitment chain from an initial height. // newCommitmentChain creates a new commitment chain.
func newCommitmentChain(initialHeight uint64) *commitmentChain { func newCommitmentChain() *commitmentChain {
return &commitmentChain{ return &commitmentChain{
commitments: list.New(), commitments: list.New(),
startingHeight: initialHeight,
} }
} }
@ -1381,8 +1380,8 @@ func NewLightningChannel(signer Signer, pCache PreimageCache,
Signer: signer, Signer: signer,
pCache: pCache, pCache: pCache,
currentHeight: localCommit.CommitHeight, currentHeight: localCommit.CommitHeight,
remoteCommitChain: newCommitmentChain(remoteCommit.CommitHeight), remoteCommitChain: newCommitmentChain(),
localCommitChain: newCommitmentChain(localCommit.CommitHeight), localCommitChain: newCommitmentChain(),
channelState: state, channelState: state,
localChanCfg: &state.LocalChanCfg, localChanCfg: &state.LocalChanCfg,
remoteChanCfg: &state.RemoteChanCfg, remoteChanCfg: &state.RemoteChanCfg,