formatting: correctly pass DecayedLog, changed Put

This commit fixes previously incorrect passing of DecayedLog
to newTestRoute in bench_test.go, sphinx_test.go, and in
sphinx.go. A pointer to DecayedLog is used instead. Additionally,
serialization of the CLTV value is moved out of the Put function's
boltdb.Batch call.

Author: nsa

bench_test.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/roasbeef/btcd/btcec"
 	"github.com/lightningnetwork/lightning-onion/persistlog"
+	"github.com/roasbeef/btcd/btcec"
 )
 
 var (
@@ -58,7 +58,7 @@ func BenchmarkProcessPacket(b *testing.B) {
 	b.StopTimer()
 
 	// Create the DecayedLog object
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		b.Fatalf("unable to start channeldb")
 	}

persistlog/decayedlog.go

@@ -176,18 +176,19 @@ func (d *DecayedLog) Get(hash []byte) (
 // sharedHashBucket.
 func (d *DecayedLog) Put(hash []byte,
 	value uint32) error {
-	return d.db.Batch(func(tx *bolt.Tx) error {
-		var scratch [4]byte
 
+	var scratch [4]byte
+
+	// Store value into scratch
+	binary.BigEndian.PutUint32(scratch[:], value)
+
+	return d.db.Batch(func(tx *bolt.Tx) error {
 		sharedHashes, err := tx.CreateBucketIfNotExists(sharedHashBucket)
 		if err != nil {
 			return fmt.Errorf("Unable to create bucket sharedHashes:"+
 				" %v", err)
 		}
 
-		// Store value into scratch
-		binary.BigEndian.PutUint32(scratch[:], value)
-
 		return sharedHashes.Put(hash, scratch[:])
 	})
 }

sphinx.go

@@ -621,7 +621,7 @@ type Router struct {
 
 	onionKey *btcec.PrivateKey
 
-	d persistlog.DecayedLog
+	d *persistlog.DecayedLog
 }
 
 // NewRouter creates a new instance of a Sphinx onion Router given the node's
@@ -634,7 +634,7 @@ func NewRouter(nodeKey *btcec.PrivateKey, net *chaincfg.Params,
 	// Safe to ignore the error here, nodeID is 20 bytes.
 	nodeAddr, _ := btcutil.NewAddressPubKeyHash(nodeID[:], net)
 
-	d := persistlog.DecayedLog{
+	d := &persistlog.DecayedLog{
 		Notifier: chainNotifier,
 	}
 

sphinx_test.go

@@ -87,7 +87,7 @@ var (
 		"baaa7d63ad64199f4664813b955cff954949076dcf"
 )
 
-func newTestRoute(numHops int, d persistlog.DecayedLog) ([]*Router, *[]HopData, *OnionPacket, error) {
+func newTestRoute(numHops int, d *persistlog.DecayedLog) ([]*Router, *[]HopData, *OnionPacket, error) {
 	nodes := make([]*Router, numHops)
 
 	// Create numHops random sphinx nodes.
@@ -182,7 +182,7 @@ func TestBolt4Packet(t *testing.T) {
 }
 
 func TestSphinxCorrectness(t *testing.T) {
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		t.Fatalf("unable to start channeldb")
 	}
@@ -248,7 +248,7 @@ func TestSphinxSingleHop(t *testing.T) {
 	// We'd like to test the proper behavior of the correctness of onion
 	// packet processing for "single-hop" payments which bare a full onion
 	// packet.
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		t.Fatalf("unable to start channeldb")
 	}
@@ -275,7 +275,7 @@ func TestSphinxSingleHop(t *testing.T) {
 func TestSphinxNodeRelpay(t *testing.T) {
 	// We'd like to ensure that the sphinx node itself rejects all replayed
 	// packets which share the same shared secret.
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		t.Fatalf("unable to start channeldb")
 	}
@@ -301,7 +301,7 @@ func TestSphinxNodeRelpay(t *testing.T) {
 func TestSphinxAssocData(t *testing.T) {
 	// We want to make sure that the associated data is considered in the
 	// HMAC creation
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		t.Fatalf("unable to start channeldb")
 	}
@@ -319,7 +319,7 @@ func TestSphinxAssocData(t *testing.T) {
 func TestSphinxEncodeDecode(t *testing.T) {
 	// Create some test data with a randomly populated, yet valid onion
 	// forwarding message.
-	d := persistlog.DecayedLog{}
+	d := &persistlog.DecayedLog{}
 	if err := d.Start(); err != nil {
 		t.Fatalf("unable to start channeldb")
 	}