refactor!: use github.com/bassosimone/runtimex (#95)

I decided to make a separate library to maximize reuse. So, let's use
this library instead.

BREAKING CHANGE: As a side effect, require go1.25 for building now.

Author: bassosimone

.github/workflows/go.yml

@@ -16,7 +16,6 @@ jobs:
         goversion:
           # The first entry of the matrix should be the
           # version indicated inside the `go.mod`
-          - "1.24"
           - "1.25"
 
     runs-on: ubuntu-latest

README.md

@@ -25,7 +25,7 @@ outages, misconfigurations, censorship, and performance issues.
 
 ## Minimum Required Go Version
 
-Go 1.24.
+Go 1.25.
 
 ## Installation
 

go.mod

@@ -1,8 +1,9 @@
 module github.com/rbmk-project/rbmk
 
-go 1.24.2
+go 1.25.5
 
 require (
+	github.com/bassosimone/runtimex v0.0.0-20260108162100-336f3823f6b7
 	github.com/charmbracelet/glamour v0.10.0
 	github.com/google/go-cmp v0.7.0
 	github.com/miekg/dns v1.1.70

go.sum

@@ -10,6 +10,8 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
 github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/bassosimone/runtimex v0.0.0-20260108162100-336f3823f6b7 h1:9qKFMaKc84pZ1i7FMUGLMqo56rv4miCd4/+qlH9SWDI=
+github.com/bassosimone/runtimex v0.0.0-20260108162100-336f3823f6b7/go.mod h1:GDr46yuJzuDkzOMI1/9Voo3s7VmYBU/6pkuaI5FR7gE=
 github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
 github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
 github.com/charmbracelet/glamour v0.10.0 h1:MtZvfwsYCx8jEPFJm3rIBFIMZUfUJ765oX8V6kXldcY=

pkg/common/runtimex/runtimex.go

@@ -16,7 +16,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/rbmk-project/rbmk/pkg/common/runtimex"
+	"github.com/bassosimone/runtimex"
 )
 
 // Config contains configuration for [New].
@@ -58,21 +58,21 @@ type Cert struct {
 //
 // This method panics on failure.
 func (c *Cert) WriteFiles(baseDir string) {
-	runtimex.Try0(os.WriteFile(filepath.Join(baseDir, "cert.pem"), c.CertPEM, 0600))
-	runtimex.Try0(os.WriteFile(filepath.Join(baseDir, "key.pem"), c.KeyPEM, 0600))
+	runtimex.PanicOnError0(os.WriteFile(filepath.Join(baseDir, "cert.pem"), c.CertPEM, 0600))
+	runtimex.PanicOnError0(os.WriteFile(filepath.Join(baseDir, "key.pem"), c.KeyPEM, 0600))
 }
 
 // New generates a self-signed certificate and key with SANs.
 //
 // This function panics on failure.
 func New(config *Config) *Cert {
 	// Generate the private key
-	priv := runtimex.Try1(ecdsa.GenerateKey(elliptic.P256(), rand.Reader))
+	priv := runtimex.PanicOnError1(ecdsa.GenerateKey(elliptic.P256(), rand.Reader))
 
 	// Build the certificate template
 	notBefore := time.Now()
 	notAfter := notBefore.Add(365 * 24 * time.Hour)
-	serialNumber := runtimex.Try1(rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128)))
+	serialNumber := runtimex.PanicOnError1(rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128)))
 	template := x509.Certificate{
 		SerialNumber: serialNumber,
 		Subject: pkix.Name{
@@ -91,12 +91,12 @@ func New(config *Config) *Cert {
 	template.IPAddresses = config.IPAddrs
 
 	// Generate the certificate proper and encoded to PEM
-	certDER := runtimex.Try1(x509.CreateCertificate(
+	certDER := runtimex.PanicOnError1(x509.CreateCertificate(
 		rand.Reader, &template, &template, &priv.PublicKey, priv))
 	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER})
 
 	// Generate the private key in PEM format
-	keyPEM := runtimex.Try1(x509.MarshalECPrivateKey(priv))
+	keyPEM := runtimex.PanicOnError1(x509.MarshalECPrivateKey(priv))
 	keyPEMBytes := pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyPEM})
 
 	// Return the results

pkg/common/runtimex/runtimex_test.go

@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/rbmk-project/rbmk/pkg/common/runtimex"
+	"github.com/bassosimone/runtimex"
 	"github.com/rbmk-project/rbmk/pkg/common/selfsignedcert"
 )
 
@@ -22,9 +22,9 @@ func TestSelfSignedCert(t *testing.T) {
 
 	// 2. create a suitable TLS listener
 	serverConfig := &tls.Config{Certificates: []tls.Certificate{
-		runtimex.Try1(tls.X509KeyPair(cert.CertPEM, cert.KeyPEM)),
+		runtimex.PanicOnError1(tls.X509KeyPair(cert.CertPEM, cert.KeyPEM)),
 	}}
-	listener := runtimex.Try1(tls.Listen("tcp", "127.0.0.1:0", serverConfig))
+	listener := runtimex.PanicOnError1(tls.Listen("tcp", "127.0.0.1:0", serverConfig))
 	defer listener.Close()
 
 	// 3. create a listening HTTP server using the testdata files
@@ -38,7 +38,7 @@ func TestSelfSignedCert(t *testing.T) {
 
 	// 4. create a suitable HTTP client
 	pool := x509.NewCertPool()
-	runtimex.Assert(pool.AppendCertsFromPEM(cert.CertPEM), "cannot append PEM cert")
+	runtimex.Assert(pool.AppendCertsFromPEM(cert.CertPEM))
 	clientConfig := &tls.Config{RootCAs: pool}
 	client := &http.Client{
 		Transport: &http.Transport{

pkg/common/selfsignedcert/selfsignedcert.go

@@ -13,9 +13,9 @@ import (
 	"net/netip"
 	"testing"
 
+	"github.com/bassosimone/runtimex"
 	"github.com/miekg/dns"
 	"github.com/rbmk-project/rbmk/pkg/common/mocks"
-	"github.com/rbmk-project/rbmk/pkg/common/runtimex"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -234,7 +234,7 @@ func TestTransport_httpClientDo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			transport := tt.setupTransport()
-			req := runtimex.Try1(http.NewRequest("GET", "https://example.com", nil))
+			req := runtimex.PanicOnError1(http.NewRequest("GET", "https://example.com", nil))
 			resp, la, ra, err := transport.httpClientDo(req)
 			if tt.expectedError != nil {
 				assert.Error(t, err)

pkg/common/selfsignedcert/selfsignedcert_test.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/bassosimone/runtimex"
 	"github.com/miekg/dns"
-	"github.com/rbmk-project/rbmk/pkg/common/runtimex"
 	"github.com/rbmk-project/rbmk/pkg/dns/dnscore"
 )
 
@@ -45,7 +45,7 @@ func ExampleTransport_dnsOverHTTPS() {
 	if err := dnscore.ValidateResponse(query, resp); err != nil {
 		log.Fatal(err)
 	}
-	runtimex.Assert(len(query.Question) > 0, "expected at least one question")
+	runtimex.Assert(len(query.Question) > 0)
 	rrs, err := dnscore.ValidAnswers(query.Question[0], resp)
 	if err != nil {
 		log.Fatal(err)