Add Explicit Commit, Dynamo Equivalence Check, and Temporary and Permanent Error Distinctions

.github/workflows/challenge-bypass-tests.yaml

@@ -10,5 +10,7 @@ jobs:
     steps:
       - name: checkout repo
         uses: actions/checkout@v3
+      - name: run lint
+        run: make lint
       - name: run tests
         run: make docker-test

.golangci.yaml

@@ -3,14 +3,14 @@ run:
   timeout: 3m
 
 linters-settings:
-  cyclop:
+  #cyclop:
     # The maximal code complexity to report.
     # Default: 10
-    max-complexity: 10
+    #  max-complexity: 10
     # The maximal average package complexity.
     # If it's higher than 0.0 (float) the check is enabled
     # Default: 0.0
-    package-average: 10.0
+    #package-average: 10.0
 
   errcheck:
     # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
@@ -41,23 +41,23 @@ linters:
   disable-all: true
   enable:
     ## enabled by default
-    - deadcode # Finds unused code
+    #- deadcode # Finds unused code
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
     - gosimple # Linter for Go source code that specializes in simplifying a code
     - govet # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - ineffassign # Detects when assignments to existing variables are not used
     - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-    - structcheck # Finds unused struct fields
+      #- structcheck # Finds unused struct fields
     - typecheck # Like the front-end of a Go compiler, parses and type-checks Go code
     - unused # Checks Go code for unused constants, variables, functions and types
-    - varcheck # Finds unused global variables and constants
+      #- varcheck # Finds unused global variables and constants
 #    ## disabled by default
     - contextcheck # check the function whether use a non-inherited context
-    - cyclop # checks function and package cyclomatic complexity
+      #- cyclop # checks function and package cyclomatic complexity
     - errname # Checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error.
     - gocritic # Provides diagnostics that check for bugs, performance and style issues.
-    - gocyclo # Computes and checks the cyclomatic complexity of functions
-    - nestif # Reports deeply nested if statements
+      #- gocyclo # Computes and checks the cyclomatic complexity of functions
+      #- nestif # Reports deeply nested if statements
     - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
     - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed
     - stylecheck # Stylecheck is a replacement for golint

Makefile

@@ -22,4 +22,4 @@ generate-avro:
 	sed -i 's/"public_key/"issuer_public_key/g' ./avro/generated/signing_result*.go
 
 lint:
-	docker run --rm -v "$$(pwd):/app" --workdir /app golangci/golangci-lint:v1.46.2 go get ./... && golangci-lint run -v ./...
+	docker run --rm -v "$$(pwd):/app" --workdir /app golangci/golangci-lint:v1.49.0 golangci-lint run -v ./...

avro/schemas/redeem_result.avsc

@@ -21,7 +21,7 @@
                             "type": {
                                 "name": "RedeemResultStatus",
                                 "type": "enum",
-                                "symbols": ["ok", "duplicate_redemption", "unverified", "error"]
+                                "symbols": ["ok", "duplicate_redemption", "unverified", "error", "idempotent_redemption"]
                             }
                         },
                         {"name": "associated_data", "type": "bytes", "doc": "contains METADATA"}

btd/issuer.go

@@ -9,8 +9,10 @@ import (
 )
 
 var (
-	ErrInvalidMAC        = errors.New("binding MAC didn't match derived MAC")
-	ErrInvalidBatchProof = errors.New("New batch proof for signed tokens is invalid")
+	// ErrInvalidMAC - the mac was invalid
+	ErrInvalidMAC = errors.New("binding MAC didn't match derived MAC")
+	// ErrInvalidBatchProof - the batch proof was invalid
+	ErrInvalidBatchProof = errors.New("new batch proof for signed tokens is invalid")
 
 	latencyBuckets = []float64{.25, .5, 1, 2.5, 5, 10}
 
@@ -74,7 +76,7 @@ func init() {
 func ApproveTokens(blindedTokens []*crypto.BlindedToken, key *crypto.SigningKey) ([]*crypto.SignedToken, *crypto.BatchDLEQProof, error) {
 	var err error
 	if len(blindedTokens) < 1 {
-		err = errors.New("Provided blindedTokens array was empty.")
+		err = errors.New("provided blindedTokens array was empty")
 		return []*crypto.SignedToken{}, nil, err
 	}
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/actgardner/gogen-avro/v10 v10.2.1
 	github.com/aws/aws-sdk-go v1.44.136
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.4
-	github.com/brave-intl/bat-go/libs v0.0.0-20220823005459-d3a4d8ccf976
+	github.com/brave-intl/bat-go/libs v0.0.0-20220913154833-730f36b772de
 	github.com/brave-intl/challenge-bypass-ristretto-ffi v0.0.0-20190717223301-f88d942ddfaf
 	github.com/getsentry/raven-go v0.2.0
 	github.com/go-chi/chi v4.1.2+incompatible
@@ -32,7 +32,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/containerd v1.6.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/getsentry/sentry-go v0.13.0 // indirect
 	github.com/go-chi/chi/v5 v5.0.7 // indirect
@@ -48,7 +47,6 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
 	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -184,8 +184,8 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/brave-intl/bat-go/libs v0.0.0-20220823005459-d3a4d8ccf976 h1:kz83/D17IsaIVrDSqYvNgyLgMRvgSExcHvFOsRAOPEM=
-github.com/brave-intl/bat-go/libs v0.0.0-20220823005459-d3a4d8ccf976/go.mod h1:bIOgpByIK7sC11XzdMZlM1Ri17g0eYqLFs5sd/D1wF8=
+github.com/brave-intl/bat-go/libs v0.0.0-20220913154833-730f36b772de h1:A7l6jiuZW6ED7SuDK331LhkCqQNUYNv0RclciTwvIZU=
+github.com/brave-intl/bat-go/libs v0.0.0-20220913154833-730f36b772de/go.mod h1:Hdx1PUXLp4TevCH6X7hzfCBcjaQnuechLVUWqD2I3aQ=
 github.com/brave-intl/challenge-bypass-ristretto-ffi v0.0.0-20190717223301-f88d942ddfaf h1:ZAsT/fM7Kxipf3wtoY7xa2bpFmAxzYPhVJ3hUcSdTRI=
 github.com/brave-intl/challenge-bypass-ristretto-ffi v0.0.0-20190717223301-f88d942ddfaf/go.mod h1:I9sAUIQc7AvvUU0Ustl5WMTdqmlNjXsX6dRLnDNxXiE=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
@@ -274,7 +274,6 @@ github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0
 github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
 github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
 github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
-github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -935,7 +934,6 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
-github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

kafka/avro_test.go

@@ -2,11 +2,12 @@ package kafka
 
 import (
 	"bytes"
+	"testing"
+	"time"
+
 	avroSchema "github.com/brave-intl/challenge-bypass-server/avro/generated"
 	"github.com/brave-intl/challenge-bypass-server/utils/test"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 // Tests v2 adds new fields validTo, validFrom and BlindedTokens.
@@ -37,8 +38,8 @@ func TestSchemaCompatability_SigningResult_V2ToV1(t *testing.T) {
 	assert.Equal(t, v2.Status.String(), v1.Status.String())
 }
 
-//// Tests v2 consumers reading v1 messages.
-//func TestSchemaCompatability_SigningResult_V1ToV2(t *testing.T) {
+// Tests v2 consumers reading v1 messages.
+// func TestSchemaCompatability_SigningResult_V1ToV2(t *testing.T) {
 //	v1 := &avroSchema.SigningResultV1{
 //		Signed_tokens:     []string{test.RandomString()},
 //		Issuer_public_key: test.RandomString(),
@@ -50,7 +51,6 @@ func TestSchemaCompatability_SigningResult_V2ToV1(t *testing.T) {
 //	var buf bytes.Buffer
 //	err := v1.Serialize(&buf)
 //	assert.NoError(t, err)
-//
 //	v2, err := avroSchema.DeserializeSigningResultV2(&buf)
 //	assert.NoError(t, err)
 //
@@ -61,4 +61,4 @@ func TestSchemaCompatability_SigningResult_V2ToV1(t *testing.T) {
 //	//assert.Nil(t, v2.Valid_to)
 //	//assert.Nil(t, v2.Valid_from)
 //	assert.Empty(t, v2.Blinded_tokens)
-//}
+// }