Skip to content

Commit f369147

Browse files
brendanjryanbrendanjryan
committed
fix: resolve rebase conflicts against main
1 parent 40c88f6 commit f369147

12 files changed

Lines changed: 47 additions & 80 deletions

File tree

‎examples/basic/client/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010

1111
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
12-
mppclient "github.com/tempoxyz/mpp-go/pkg/client"
12+
"github.com/tempoxyz/mpp-go/pkg/client"
1313
"github.com/tempoxyz/mpp-go/pkg/mpp"
1414
"github.com/tempoxyz/mpp-go/pkg/tempo"
1515
charge "github.com/tempoxyz/mpp-go/pkg/tempo/client"
@@ -47,7 +47,7 @@ func main() {
4747
log.Fatal(err)
4848
}
4949

50-
client := mppclient.New([]mppclient.Method{method})
50+
c := client.New([]client.Method{method})
5151
baseURL := os.Getenv("BASE_URL")
5252
if baseURL == "" {
5353
baseURL = "http://localhost:3000"
@@ -57,7 +57,7 @@ func main() {
5757
target = os.Args[1]
5858
}
5959

60-
resp, err := client.Get(ctx, target)
60+
resp, err := c.Get(ctx, target)
6161
if err != nil {
6262
log.Fatal(err)
6363
}

‎examples/basic/server/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/ethereum/go-ethereum/crypto"
1212
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
13-
mppserver "github.com/tempoxyz/mpp-go/pkg/server"
13+
"github.com/tempoxyz/mpp-go/pkg/server"
1414
"github.com/tempoxyz/mpp-go/pkg/tempo"
1515
charge "github.com/tempoxyz/mpp-go/pkg/tempo/server"
1616
temposigner "github.com/tempoxyz/tempo-go/pkg/signer"
@@ -47,7 +47,7 @@ func main() {
4747
log.Fatal(err)
4848
}
4949

50-
intent, err := charge.NewChargeIntent(charge.ChargeIntentConfig{RPCURL: rpcURL})
50+
intent, err := charge.NewIntent(charge.IntentConfig{RPCURL: rpcURL})
5151
if err != nil {
5252
log.Fatal(err)
5353
}
@@ -64,25 +64,25 @@ func main() {
6464
secretKey = envSecret
6565
}
6666

67-
payment := mppserver.New(method, devnet.Realm, secretKey)
67+
payment := server.New(method, devnet.Realm, secretKey)
6868
mux := http.NewServeMux()
6969

7070
mux.HandleFunc("/api/health", func(w http.ResponseWriter, r *http.Request) {
7171
_ = json.NewEncoder(w).Encode(map[string]any{"status": "ok"})
7272
})
7373

74-
mux.Handle("/api/ping", mppserver.ChargeMiddleware(payment, mppserver.ChargeParams{
74+
mux.Handle("/api/ping", server.ChargeMiddleware(payment, server.ChargeParams{
7575
Amount: "0.01",
7676
Description: "Ping the API",
7777
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
7878
_ = json.NewEncoder(w).Encode(map[string]any{"pong": true})
7979
})))
8080

81-
mux.Handle("/api/fortune", mppserver.ChargeMiddleware(payment, mppserver.ChargeParams{
81+
mux.Handle("/api/fortune", server.ChargeMiddleware(payment, server.ChargeParams{
8282
Amount: "1.00",
8383
Description: "Get a fortune",
8484
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
85-
credential := mppserver.CredentialFromContext(r.Context())
85+
credential := server.CredentialFromContext(r.Context())
8686
fortune := fortunes[rand.IntN(len(fortunes))]
8787
_ = json.NewEncoder(w).Encode(map[string]any{
8888
"fortune": fortune,

‎examples/charge-basic/client/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99

1010
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
11-
mppclient "github.com/tempoxyz/mpp-go/pkg/client"
11+
"github.com/tempoxyz/mpp-go/pkg/client"
1212
"github.com/tempoxyz/mpp-go/pkg/mpp"
1313
"github.com/tempoxyz/mpp-go/pkg/tempo"
1414
charge "github.com/tempoxyz/mpp-go/pkg/tempo/client"
@@ -40,13 +40,13 @@ func main() {
4040
if err != nil {
4141
log.Fatal(err)
4242
}
43-
client := mppclient.New([]mppclient.Method{method})
43+
c := client.New([]client.Method{method})
4444

4545
baseURL := os.Getenv("BASE_URL")
4646
if baseURL == "" {
4747
baseURL = "http://localhost:3000"
4848
}
49-
response, err := client.Get(ctx, baseURL+"/paid")
49+
response, err := c.Get(ctx, baseURL+"/paid")
5050
if err != nil {
5151
log.Fatal(err)
5252
}

‎examples/charge-basic/server/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88

99
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
10-
mppserver "github.com/tempoxyz/mpp-go/pkg/server"
10+
"github.com/tempoxyz/mpp-go/pkg/server"
1111
"github.com/tempoxyz/mpp-go/pkg/tempo"
1212
charge "github.com/tempoxyz/mpp-go/pkg/tempo/server"
1313
)
@@ -21,7 +21,7 @@ func main() {
2121
log.Fatal(err)
2222
}
2323

24-
intent, err := charge.NewChargeIntent(charge.ChargeIntentConfig{RPCURL: rpcURL})
24+
intent, err := charge.NewIntent(charge.IntentConfig{RPCURL: rpcURL})
2525
if err != nil {
2626
log.Fatal(err)
2727
}
@@ -31,14 +31,14 @@ func main() {
3131
Currency: devnet.Currency,
3232
Recipient: devnet.Recipient,
3333
})
34-
payment := mppserver.New(method, devnet.Realm, "example-secret")
34+
payment := server.New(method, devnet.Realm, "example-secret")
3535

3636
mux := http.NewServeMux()
37-
mux.Handle("/paid", mppserver.ChargeMiddleware(payment, mppserver.ChargeParams{
37+
mux.Handle("/paid", server.ChargeMiddleware(payment, server.ChargeParams{
3838
Amount: "0.50",
3939
Description: "Basic Tempo charge example",
4040
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
41-
credential := mppserver.CredentialFromContext(r.Context())
41+
credential := server.CredentialFromContext(r.Context())
4242
_ = json.NewEncoder(w).Encode(map[string]any{
4343
"data": "paid content",
4444
"payer": credential.Source,

‎examples/charge-fee-payer/client/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99

1010
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
11-
mppclient "github.com/tempoxyz/mpp-go/pkg/client"
11+
"github.com/tempoxyz/mpp-go/pkg/client"
1212
"github.com/tempoxyz/mpp-go/pkg/mpp"
1313
"github.com/tempoxyz/mpp-go/pkg/tempo"
1414
charge "github.com/tempoxyz/mpp-go/pkg/tempo/client"
@@ -40,13 +40,13 @@ func main() {
4040
if err != nil {
4141
log.Fatal(err)
4242
}
43-
client := mppclient.New([]mppclient.Method{method})
43+
c := client.New([]client.Method{method})
4444

4545
baseURL := os.Getenv("BASE_URL")
4646
if baseURL == "" {
4747
baseURL = "http://localhost:3000"
4848
}
49-
response, err := client.Get(ctx, baseURL+"/paid")
49+
response, err := c.Get(ctx, baseURL+"/paid")
5050
if err != nil {
5151
log.Fatal(err)
5252
}

‎examples/charge-fee-payer/server/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88

99
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
10-
mppserver "github.com/tempoxyz/mpp-go/pkg/server"
10+
"github.com/tempoxyz/mpp-go/pkg/server"
1111
"github.com/tempoxyz/mpp-go/pkg/tempo"
1212
charge "github.com/tempoxyz/mpp-go/pkg/tempo/server"
1313
temposigner "github.com/tempoxyz/tempo-go/pkg/signer"
@@ -30,7 +30,7 @@ func main() {
3030
log.Fatal(err)
3131
}
3232

33-
intent, err := charge.NewChargeIntent(charge.ChargeIntentConfig{FeePayerPrivateKey: devnet.FeePayerPrivateKey, RPCURL: rpcURL})
33+
intent, err := charge.NewIntent(charge.IntentConfig{FeePayerPrivateKey: devnet.FeePayerPrivateKey, RPCURL: rpcURL})
3434
if err != nil {
3535
log.Fatal(err)
3636
}
@@ -41,15 +41,15 @@ func main() {
4141
FeePayer: true,
4242
Recipient: devnet.Recipient,
4343
})
44-
payment := mppserver.New(method, devnet.Realm, "example-secret")
44+
payment := server.New(method, devnet.Realm, "example-secret")
4545

4646
mux := http.NewServeMux()
47-
mux.Handle("/paid", mppserver.ChargeMiddleware(payment, mppserver.ChargeParams{
47+
mux.Handle("/paid", server.ChargeMiddleware(payment, server.ChargeParams{
4848
Amount: "0.50",
4949
Description: "Fee-payer Tempo charge example",
5050
FeePayer: true,
5151
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
52-
_ = json.NewEncoder(w).Encode(map[string]any{"tx": mppserver.ReceiptFromContext(r.Context()).Reference})
52+
_ = json.NewEncoder(w).Encode(map[string]any{"tx": server.ReceiptFromContext(r.Context()).Reference})
5353
})))
5454

5555
log.Printf("charge-fee-payer server listening on http://localhost:3000")

‎examples/charge-hash/client/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99

1010
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
11-
mppclient "github.com/tempoxyz/mpp-go/pkg/client"
11+
"github.com/tempoxyz/mpp-go/pkg/client"
1212
"github.com/tempoxyz/mpp-go/pkg/mpp"
1313
"github.com/tempoxyz/mpp-go/pkg/tempo"
1414
charge "github.com/tempoxyz/mpp-go/pkg/tempo/client"
@@ -40,13 +40,13 @@ func main() {
4040
if err != nil {
4141
log.Fatal(err)
4242
}
43-
client := mppclient.New([]mppclient.Method{method})
43+
c := client.New([]client.Method{method})
4444

4545
baseURL := os.Getenv("BASE_URL")
4646
if baseURL == "" {
4747
baseURL = "http://localhost:3000"
4848
}
49-
response, err := client.Get(ctx, baseURL+"/paid")
49+
response, err := c.Get(ctx, baseURL+"/paid")
5050
if err != nil {
5151
log.Fatal(err)
5252
}

‎examples/charge-hash/server/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88

99
"github.com/tempoxyz/mpp-go/examples/internal/devnet"
10-
mppserver "github.com/tempoxyz/mpp-go/pkg/server"
10+
"github.com/tempoxyz/mpp-go/pkg/server"
1111
"github.com/tempoxyz/mpp-go/pkg/tempo"
1212
charge "github.com/tempoxyz/mpp-go/pkg/tempo/server"
1313
)
@@ -21,7 +21,7 @@ func main() {
2121
log.Fatal(err)
2222
}
2323

24-
intent, err := charge.NewChargeIntent(charge.ChargeIntentConfig{RPCURL: rpcURL})
24+
intent, err := charge.NewIntent(charge.IntentConfig{RPCURL: rpcURL})
2525
if err != nil {
2626
log.Fatal(err)
2727
}
@@ -32,15 +32,15 @@ func main() {
3232
Recipient: devnet.Recipient,
3333
SupportedModes: []tempo.ChargeMode{tempo.ChargeModePush},
3434
})
35-
payment := mppserver.New(method, devnet.Realm, "example-secret")
35+
payment := server.New(method, devnet.Realm, "example-secret")
3636

3737
mux := http.NewServeMux()
38-
mux.Handle("/paid", mppserver.ChargeMiddleware(payment, mppserver.ChargeParams{
38+
mux.Handle("/paid", server.ChargeMiddleware(payment, server.ChargeParams{
3939
Amount: "0.50",
4040
Description: "Hash credential Tempo charge example",
4141
SupportedModes: []tempo.ChargeMode{tempo.ChargeModePush},
4242
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
43-
_ = json.NewEncoder(w).Encode(map[string]any{"tx": mppserver.ReceiptFromContext(r.Context()).Reference})
43+
_ = json.NewEncoder(w).Encode(map[string]any{"tx": server.ReceiptFromContext(r.Context()).Reference})
4444
})))
4545

4646
log.Printf("charge-hash server listening on http://localhost:3000")

‎pkg/mpp/challenge_vectors_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func TestEmptyOpaquePreservedOnWire(t *testing.T) {
286286
WithMeta(map[string]string{}),
287287
)
288288

289-
header := challenge.ToWWWAuthenticate("api.example.com")
289+
header := challenge.ToAuthenticate("api.example.com")
290290
if !strings.Contains(header, `opaque="`) {
291291
t.Fatalf("challenge header = %q, want opaque field", header)
292292
}

‎pkg/mpp/errors_receipt_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,77 +14,77 @@ func TestPaymentErrorConstructors(t *testing.T) {
1414
tests := []struct {
1515
name string
1616
err *PaymentError
17-
want string
17+
want ErrorType
1818
status int
1919
detail string
2020
}{
2121
{
2222
name: "payment required default detail",
2323
err: ErrPaymentRequired("api.example.com", ""),
24-
want: "https://mpp.dev/errors/payment-required",
24+
want: ErrorTypePaymentRequired,
2525
status: http.StatusPaymentRequired,
2626
detail: "Payment is required to access this resource",
2727
},
2828
{
2929
name: "payment required custom detail",
3030
err: ErrPaymentRequired("api.example.com", "custom detail"),
31-
want: "https://mpp.dev/errors/payment-required",
31+
want: ErrorTypePaymentRequired,
3232
status: http.StatusPaymentRequired,
3333
detail: "custom detail",
3434
},
3535
{
3636
name: "malformed credential",
3737
err: ErrMalformedCredential("bad credential"),
38-
want: "https://mpp.dev/errors/malformed-credential",
38+
want: ErrorTypeMalformedCredential,
3939
status: http.StatusBadRequest,
4040
detail: "bad credential",
4141
},
4242
{
4343
name: "invalid challenge",
4444
err: ErrInvalidChallenge("challenge-1", "tampered"),
45-
want: "https://mpp.dev/errors/invalid-challenge",
45+
want: ErrorTypeInvalidChallenge,
4646
status: http.StatusBadRequest,
4747
detail: "challenge challenge-1: tampered",
4848
},
4949
{
5050
name: "verification failed",
5151
err: ErrVerificationFailed("signature mismatch"),
52-
want: "https://mpp.dev/errors/verification-failed",
52+
want: ErrorTypeVerificationFailed,
5353
status: http.StatusPaymentRequired,
5454
detail: "signature mismatch",
5555
},
5656
{
5757
name: "payment expired",
5858
err: ErrPaymentExpired("2026-01-01T00:00:00Z"),
59-
want: "https://mpp.dev/errors/payment-expired",
59+
want: ErrorTypePaymentExpired,
6060
status: http.StatusPaymentRequired,
6161
detail: "payment expired at 2026-01-01T00:00:00Z",
6262
},
6363
{
6464
name: "invalid payload",
6565
err: ErrInvalidPayload("invalid payload"),
66-
want: "https://mpp.dev/errors/invalid-payload",
66+
want: ErrorTypeInvalidPayload,
6767
status: http.StatusBadRequest,
6868
detail: "invalid payload",
6969
},
7070
{
7171
name: "bad request",
7272
err: ErrBadRequest("bad request"),
73-
want: "https://mpp.dev/errors/bad-request",
73+
want: ErrorTypeBadRequest,
7474
status: http.StatusBadRequest,
7575
detail: "bad request",
7676
},
7777
{
7878
name: "payment insufficient",
7979
err: ErrPaymentInsufficient("not enough"),
80-
want: "https://mpp.dev/errors/payment-insufficient",
80+
want: ErrorTypePaymentInsufficient,
8181
status: http.StatusPaymentRequired,
8282
detail: "not enough",
8383
},
8484
{
8585
name: "method unsupported",
8686
err: ErrMethodUnsupported("stripe"),
87-
want: "https://mpp.dev/errors/method-unsupported",
87+
want: ErrorTypeMethodUnsupported,
8888
status: http.StatusBadRequest,
8989
detail: `payment method "stripe" is not supported`,
9090
},

0 commit comments

Comments
 (0)