From f258f0cdb1d12c40ed0b825fae9ad1308a25d8d2 Mon Sep 17 00:00:00 2001
From: Ethan Lowman <ethan.lowman@datadoghq.com>
Date: Tue, 12 Apr 2022 13:23:01 -0400
Subject: [PATCH] Rename DecodePayload to DecodeB64Payload

---
 dsse/sign.go      |  4 ++--
 dsse/sign_test.go | 10 +++++-----
 dsse/verify.go    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dsse/sign.go b/dsse/sign.go
index 26b6f1e..3dc05a4 100644
--- a/dsse/sign.go
+++ b/dsse/sign.go
@@ -32,12 +32,12 @@ type Envelope struct {
 }
 
 /*
-DecodePayload returns the serialized body, decoded
+DecodeB64Payload returns the serialized body, decoded
 from the envelope's payload field. A flexible
 decoder is used, first trying standard base64, then
 URL-encoded base64.
 */
-func (e *Envelope) DecodePayload() ([]byte, error) {
+func (e *Envelope) DecodeB64Payload() ([]byte, error) {
 	return b64Decode(e.Payload)
 }
 
diff --git a/dsse/sign_test.go b/dsse/sign_test.go
index 991deb1..ca88cb6 100644
--- a/dsse/sign_test.go
+++ b/dsse/sign_test.go
@@ -331,7 +331,7 @@ func TestEcdsaSign(t *testing.T) {
 	assert.Equal(t, acceptedKeys[0].KeyID, keyID, "unexpected keyid")
 }
 
-func TestDecodePayload(t *testing.T) {
+func TestDecodeB64Payload(t *testing.T) {
 	var want = make([]byte, 256)
 	for i := range want {
 		want[i] = byte(i)
@@ -345,7 +345,7 @@ func TestDecodePayload(t *testing.T) {
 		env := &Envelope{
 			Payload: b64Std,
 		}
-		got, err := env.DecodePayload()
+		got, err := env.DecodeB64Payload()
 		assert.Nil(t, err, "unexpected error")
 		assert.Equal(t, want, got, "wrong data")
 	})
@@ -353,7 +353,7 @@ func TestDecodePayload(t *testing.T) {
 		env := &Envelope{
 			Payload: b64Url,
 		}
-		got, err := env.DecodePayload()
+		got, err := env.DecodeB64Payload()
 		assert.Nil(t, err, "unexpected error")
 		assert.Equal(t, want, got, "wrong data")
 	})
@@ -362,7 +362,7 @@ func TestDecodePayload(t *testing.T) {
 		env := &Envelope{
 			Payload: b64StdErr,
 		}
-		got, err := env.DecodePayload()
+		got, err := env.DecodeB64Payload()
 		assert.NotNil(t, err, "expected error")
 		assert.Nil(t, got, "wrong data")
 	})
@@ -370,7 +370,7 @@ func TestDecodePayload(t *testing.T) {
 		env := &Envelope{
 			Payload: b64UrlErr,
 		}
-		got, err := env.DecodePayload()
+		got, err := env.DecodeB64Payload()
 		assert.NotNil(t, err, "expected error")
 		assert.Nil(t, got, "wrong data")
 	})
diff --git a/dsse/verify.go b/dsse/verify.go
index a249c35..ead1c32 100644
--- a/dsse/verify.go
+++ b/dsse/verify.go
@@ -41,7 +41,7 @@ func (ev *EnvelopeVerifier) Verify(e *Envelope) ([]AcceptedKey, error) {
 	}
 
 	// Decode payload (i.e serialized body)
-	body, err := e.DecodePayload()
+	body, err := e.DecodeB64Payload()
 	if err != nil {
 		return nil, err
 	}