Fix broken test, fix onion TLS listener which broke

Makefile

@@ -1,13 +1,14 @@
 
 USER_GH=eyedeekay
-VERSION=0.33.7
+VERSION=0.33.8
+CREDIT='contributors to this release: @hkh4n, @eyedeekay'
 packagename=onramp
 
 echo: fmt
 	@echo "type make version to do release $(VERSION)"
 
 version:
-	github-release release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "version $(VERSION)"
+	github-release release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "version $(VERSION) $(CREDIT)"
 
 del:
 	github-release delete -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION)

garlic_test.go

@@ -17,7 +17,10 @@ import (
 func TestBareGarlic(t *testing.T) {
 	fmt.Println("TestBareGarlic Countdown")
 	Sleep(5)
-	garlic := &Garlic{}
+	garlic, err := NewGarlic("test123", "localhost:7656", OPT_WIDE)
+	if err != nil {
+		t.Error(err)
+	}
 	defer garlic.Close()
 	listener, err := garlic.ListenTLS()
 	if err != nil {
@@ -29,9 +32,14 @@ func TestBareGarlic(t *testing.T) {
 		fmt.Fprintf(w, "Hello, %q", r.URL.Path)
 	})
 	go Serve(listener)
-	Sleep(15)
+	garlic2, err := NewGarlic("test321", "localhost:7656", OPT_WIDE)
+	if err != nil {
+		t.Error(err)
+	}
+	defer garlic2.Close()
+	Sleep(60)
 	transport := http.Transport{
-		Dial: garlic.Dial,
+		Dial: garlic2.Dial,
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
 		},

go.mod

@@ -4,8 +4,8 @@ go 1.18
 
 require (
 	github.com/cretz/bine v0.2.0
-	github.com/eyedeekay/i2pkeys v0.33.7
-	github.com/eyedeekay/sam3 v0.33.7
+	github.com/eyedeekay/i2pkeys v0.33.8
+	github.com/eyedeekay/sam3 v0.33.8
 )
 
 require (

go.sum

@@ -4,8 +4,12 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/eyedeekay/i2pkeys v0.33.7 h1:cxqHSkl6b2lHyPJUtIQZBiipYf7NQVYqM1d3ub0MI4k=
 github.com/eyedeekay/i2pkeys v0.33.7/go.mod h1:W9KCm9lqZ+Ozwl3dwcgnpPXAML97+I8Jiht7o5A8YBM=
+github.com/eyedeekay/i2pkeys v0.33.8 h1:f3llyruchFqs1QwCacBYbShArKPpMSSOqo/DVZXcfVs=
+github.com/eyedeekay/i2pkeys v0.33.8/go.mod h1:W9KCm9lqZ+Ozwl3dwcgnpPXAML97+I8Jiht7o5A8YBM=
 github.com/eyedeekay/sam3 v0.33.7 h1:GPYHG4NHxvhqPbGNJ3wKvUQyZSTCmX17f5L5QvyefGs=
 github.com/eyedeekay/sam3 v0.33.7/go.mod h1:25cRGEFawSkbiPNSh7vTUIpRtEYLVLg/4J4He6LndAY=
+github.com/eyedeekay/sam3 v0.33.8 h1:emuSZ4qSyoqc1EDjIBFbJ3GXNHOXw6hjbNp2OqdOpgI=
+github.com/eyedeekay/sam3 v0.33.8/go.mod h1:ytbwLYLJlW6UA92Ffyc6oioWTKnGeeUMr9CLuJbtqSA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

onion_test.go

@@ -15,7 +15,10 @@ import (
 func TestBareOnion(t *testing.T) {
 	fmt.Println("TestBareOnion Countdown")
 	Sleep(5)
-	onion := &Onion{}
+	onion, err := NewOnion("test123")
+	if err != nil {
+		t.Error(err)
+	}
 	defer onion.Close()
 	listener, err := onion.ListenTLS()
 	if err != nil {
@@ -27,7 +30,7 @@ func TestBareOnion(t *testing.T) {
 		fmt.Fprintf(w, "Hello, %q", r.URL.Path)
 	})
 	go Serve(listener)
-	Sleep(15)
+	Sleep(60)
 	transport := http.Transport{
 		Dial: onion.Dial,
 		TLSClientConfig: &tls.Config{

tls.go

@@ -40,7 +40,7 @@ func (o *Onion) TLSKeys() (tls.Certificate, error) {
 	if err != nil {
 		return tls.Certificate{}, err
 	}
-	onionService := torutil.OnionServiceIDFromPrivateKey(keys.PrivateKey)
+	onionService := torutil.OnionServiceIDFromPrivateKey(keys)
 	return TLSKeys(onionService)
 }