Merge pull request #35 from Roasbeef/eob-refactoring-prep

multi: eob refactoring prep

Author: Roasbeef

.travis.yml

@@ -1,11 +1,17 @@
 language: go
+cache:
+  directories:
+    - $GOCACHE
+    - $GOPATH/pkg/mod
+    - $GOPATH/src/github.com/btcsuite
+    - $GOPATH/src/github.com/golang
+
 go:
-  - 1.9.4
-  - "1.10"
-sudo: false
-install:
-  - go get -v github.com/lightningnetwork/lightning-onion
-  - go get -v github.com/davecgh/go-spew/spew
+  - "1.12.x"
+
+sudo: required
+
 script:
   - export PATH=$PATH:$HOME/gopath/bin
+  - export GO111MODULE=on
   - go test -v

bench_test.go

@@ -14,37 +14,40 @@ var (
 
 func BenchmarkPathPacketConstruction(b *testing.B) {
 	b.StopTimer()
-	route := make([]*btcec.PublicKey, NumMaxHops)
-	for i := 0; i < NumMaxHops; i++ {
-		privKey, err := btcec.NewPrivateKey(btcec.S256())
-		if err != nil {
-			b.Fatalf("unable to generate key: %v", privKey)
-		}
-
-		route[i] = privKey.PubKey()
-	}
 
 	var (
 		err          error
 		sphinxPacket *OnionPacket
+		route        PaymentPath
 	)
 
-	var hopsData []HopData
-	for i := 0; i < len(route); i++ {
-		hopsData = append(hopsData, HopData{
-			Realm:         0x00,
+	for i := 0; i < NumMaxHops; i++ {
+		privKey, err := btcec.NewPrivateKey(btcec.S256())
+		if err != nil {
+			b.Fatalf("unable to generate key: %v", privKey)
+		}
+
+		hopData := HopData{
+			Realm:         [1]byte{0x00},
 			ForwardAmount: uint64(i),
 			OutgoingCltv:  uint32(i),
-		})
-		copy(hopsData[i].NextAddress[:], bytes.Repeat([]byte{byte(i)}, 8))
+		}
+		copy(hopData.NextAddress[:], bytes.Repeat([]byte{byte(i)}, 8))
+
+		route[i] = OnionHop{
+			NodePub: *privKey.PubKey(),
+			HopData: hopData,
+		}
 	}
 
 	d, _ := btcec.PrivKeyFromBytes(btcec.S256(), bytes.Repeat([]byte{'A'}, 32))
+
 	b.ReportAllocs()
+
 	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
-		sphinxPacket, err = NewOnionPacket(route, d, hopsData, nil)
+		sphinxPacket, err = NewOnionPacket(&route, d, nil)
 		if err != nil {
 			b.Fatalf("unable to create packet: %v", err)
 		}
@@ -55,7 +58,7 @@ func BenchmarkPathPacketConstruction(b *testing.B) {
 
 func BenchmarkProcessPacket(b *testing.B) {
 	b.StopTimer()
-	path, _, sphinxPacket, err := newTestRoute(1)
+	path, _, _, sphinxPacket, err := newTestRoute(1)
 	if err != nil {
 		b.Fatalf("unable to create test route: %v", err)
 	}

cmd/main.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"strings"
 
-	sphinx "github.com/lightningnetwork/lightning-onion"
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/btcsuite/btcd/chaincfg"
+	sphinx "github.com/lightningnetwork/lightning-onion"
 )
 
 // main implements a simple command line utility that can be used in order to
@@ -25,7 +25,7 @@ func main() {
 	if len(args) == 1 {
 		fmt.Printf("Usage: %s (generate|decode) <private-keys>\n", args[0])
 	} else if args[1] == "generate" {
-		var route []*btcec.PublicKey
+		var path sphinx.PaymentPath
 		for i, hexKey := range args[2:] {
 			binKey, err := hex.DecodeString(hexKey)
 			if err != nil || len(binKey) != 33 {
@@ -37,23 +37,22 @@ func main() {
 				panic(err)
 			}
 
-			route = append(route, pubkey)
+			path[i] = sphinx.OnionHop{
+				NodePub: *pubkey,
+				HopData: sphinx.HopData{
+					Realm:         [1]byte{0x00},
+					ForwardAmount: uint64(i),
+					OutgoingCltv:  uint32(i),
+				},
+			}
+			copy(path[i].HopData.NextAddress[:], bytes.Repeat([]byte{byte(i)}, 8))
+
 			fmt.Fprintf(os.Stderr, "Node %d pubkey %x\n", i, pubkey.SerializeCompressed())
 		}
 
 		sessionKey, _ := btcec.PrivKeyFromBytes(btcec.S256(), bytes.Repeat([]byte{'A'}, 32))
 
-		var hopsData []sphinx.HopData
-		for i := 0; i < len(route); i++ {
-			hopsData = append(hopsData, sphinx.HopData{
-				Realm:         0x00,
-				ForwardAmount: uint64(i),
-				OutgoingCltv:  uint32(i),
-			})
-			copy(hopsData[i].NextAddress[:], bytes.Repeat([]byte{byte(i)}, 8))
-		}
-
-		msg, err := sphinx.NewOnionPacket(route, sessionKey, hopsData, assocData)
+		msg, err := sphinx.NewOnionPacket(&path, sessionKey, assocData)
 		if err != nil {
 			log.Fatalf("Error creating message: %v", err)
 		}