lint: fix linter complaints

This commit is contained in:
Philip Hayes 2017-05-07 14:58:53 -07:00 committed by Olaoluwa Osuntokun
parent 56793a1041
commit ce411f8e22
2 changed files with 10 additions and 9 deletions

@ -231,7 +231,7 @@ func initBreachedOutputs() error {
sd := &breachSignDescs[i] sd := &breachSignDescs[i]
pubkey, err := btcec.ParsePubKey(breachKeys[i], btcec.S256()) pubkey, err := btcec.ParsePubKey(breachKeys[i], btcec.S256())
if err != nil { if err != nil {
fmt.Errorf("unable to parse pubkey: %v", breachKeys[i]) return fmt.Errorf("unable to parse pubkey: %v", breachKeys[i])
} }
sd.PubKey = pubkey sd.PubKey = pubkey
bo.signDescriptor = sd bo.signDescriptor = sd
@ -303,7 +303,7 @@ func TestRetributionSerialization(t *testing.T) {
// callback which cleans up the created temporary directories is also returned // callback which cleans up the created temporary directories is also returned
// and intended to be executed after the test completes. // and intended to be executed after the test completes.
func makeTestDB() (*channeldb.DB, func(), error) { func makeTestDB() (*channeldb.DB, func(), error) {
var db *channeldb.DB = nil var db *channeldb.DB
// First, create a temporary directory to be used for the duration of // First, create a temporary directory to be used for the duration of
// this test. // this test.
@ -331,7 +331,7 @@ func makeTestDB() (*channeldb.DB, func(), error) {
func countRetributions(t *testing.T, rs *retributionStore) int { func countRetributions(t *testing.T, rs *retributionStore) int {
count := 0 count := 0
err := rs.ForAll(func(_ *retribution) error { err := rs.ForAll(func(_ *retribution) error {
count += 1 count++
return nil return nil
}) })
if err != nil { if err != nil {

@ -13,16 +13,17 @@ import (
type WitnessType uint16 type WitnessType uint16
const ( const (
// Witness that allows us to spend the output of a commitment transaction // CommitmentTimeLock is a witness that allows us to spend the output of a
// after a relative lock-time lockout. // commitment transaction after a relative lock-time lockout.
CommitmentTimeLock WitnessType = 0 CommitmentTimeLock WitnessType = 0
// Witness that allows us to spend a settled no-delay output immediately on // CommitmentNoDelay is a witness that allows us to spend a settled no-delay
// a counterparty's commitment transaction. // output immediately on a counterparty's commitment transaction.
CommitmentNoDelay WitnessType = 1 CommitmentNoDelay WitnessType = 1
// Witness that allows us to sweep the settled output of a malicious // CommitmentRevoke is a witness that allows us to sweep the settled output
// counterparty's who broadcasts a revoked commitment transaction. // of a malicious counterparty's who broadcasts a revoked commitment
// transaction.
CommitmentRevoke WitnessType = 2 CommitmentRevoke WitnessType = 2
) )