Merge pull request lightninglabs#3 from jmacxx/master

Merge branch 'master' of https://github.com/lightninglabs/neutrino
chappjc · Dec 26, 2019 · 2796c78 · 2796c78
2 parents 26fb2f5 + 7160dd4
commit 2796c78
Show file tree

Hide file tree

Showing 34 changed files with 3,697 additions and 1,008 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ cache:
     - $GOPATH/src/github.com/golang
     - $GOPATH/src/gopkg.in/alecthomas
 go:
-  - "1.11.x"
+  - "1.12.x"
 sudo: false
 install:
   - export PATH=$PATH:$PWD/linux-amd64/
@@ -23,5 +23,5 @@ env:
     - RACE=true
 script:
   - export GO111MODULE=on
-  - export PATH=$PATH:$HOME/gopath/bin
+  - export PATH=$PATH:$GOPATH/bin
   - ./gotest.sh
diff --git a/bamboozle_unit_test.go b/bamboozle_unit_test.go
@@ -433,7 +433,8 @@ func runCheckCFCheckptSanityTestCase(t *testing.T, testCase *cfCheckptTestCase)
 	}
 
 	cfStore, err := headerfs.NewFilterHeaderStore(
-		tempDir, db, headerfs.RegularFilter, &chaincfg.SimNetParams,
+		tempDir, db, headerfs.RegularFilter,
+		&chaincfg.SimNetParams, nil,
 	)
 	if err != nil {
 		t.Fatalf("Error creating filter header store: %s", err)

diff --git a/batch_spend_reporter.go b/batch_spend_reporter.go
@@ -210,8 +210,8 @@ func (b *batchSpendReporter) findInitialTransactions(block *wire.MsgBlock,
 		tx, ok := initialTxns[req.Input.OutPoint]
 		switch {
 		case !ok:
-			log.Errorf("Failed to find outpoint %s -- "+
-				"txid not found in block", req.Input.OutPoint)
+			log.Debugf("Outpoint %v not found in block %d ",
+				req.Input.OutPoint, height)
 			initialTxns[req.Input.OutPoint] = nil
 		case tx != nil:
 			log.Tracef("Block %d creates output %s",