From b61ffa7e6aae70d05147507aafcc68507ff17e9b Mon Sep 17 00:00:00 2001
From: Matt Fellows <matt.fellows@onegeek.com.au>
Date: Sat, 15 Aug 2020 22:59:17 +1000
Subject: [PATCH] chore: cleanup unused fields/comments

---
 v3/pact_file.go | 26 --------------------------
 v3/pact_v2.go   | 38 ++++++++------------------------------
 2 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/v3/pact_file.go b/v3/pact_file.go
index 92baf7089..149c97dbb 100644
--- a/v3/pact_file.go
+++ b/v3/pact_file.go
@@ -4,32 +4,6 @@ import (
 	version "github.com/pact-foundation/pact-go/command"
 )
 
-// Example matching rule / generated doc
-// {
-//     "method": "POST",
-//     "path": "/",
-//     "query": "",
-//     "headers": {"Content-Type": "application/json"},
-//     "matchingRules": {
-//       "$.body.animals": {"min": 1, "match": "type"},
-//       "$.body.animals[*].*": {"match": "type"},
-//       "$.body.animals[*].children": {"min": 1, "match": "type"},
-//       "$.body.animals[*].children[*].*": {"match": "type"}
-//     },
-//     "body": {
-//       "animals": [
-//         {
-//           "name" : "Fred",
-//           "children": [
-//             {
-//               "age": 9
-//             }
-//           ]
-//         }
-//       ]
-//     }
-// 	}
-
 // SpecificationVersion is used to determine the current specification version
 type SpecificationVersion string
 
diff --git a/v3/pact_v2.go b/v3/pact_v2.go
index d3c6add54..3f0ae0b62 100644
--- a/v3/pact_v2.go
+++ b/v3/pact_v2.go
@@ -61,32 +61,18 @@ func pactInteractionFromV2Interaction(interaction InteractionV2) pactInteraction
 		Description: interaction.Description,
 		State:       interaction.State,
 		Request: pactRequestV2{
-			Method:  interaction.Request.Method,
-			Body:    interaction.Request.Body,
-			Headers: interaction.Request.Headers,
-			Query:   interaction.Request.Query,
-			Path:    interaction.Request.Path,
-			// Generators:    make(generatorType),
+			Method:        interaction.Request.Method,
+			Body:          interaction.Request.Body,
+			Headers:       interaction.Request.Headers,
+			Query:         interaction.Request.Query,
+			Path:          interaction.Request.Path,
 			MatchingRules: make(ruleValue),
-			MatchingRules2: generator{
-				Body:    make(ruleValue),
-				Headers: make(ruleValue),
-				Path:    make(ruleValue),
-				Query:   make(ruleValue),
-			},
 		},
 		Response: pactResponseV2{
-			Status:  interaction.Response.Status,
-			Body:    interaction.Response.Body,
-			Headers: interaction.Response.Headers,
-			// Generators:    make(generatorType),
+			Status:        interaction.Response.Status,
+			Body:          interaction.Response.Body,
+			Headers:       interaction.Response.Headers,
 			MatchingRules: make(ruleValue),
-			MatchingRules2: matchingRule{
-				Body:    make(ruleValue),
-				Headers: make(ruleValue),
-				Path:    make(ruleValue),
-				Query:   make(ruleValue),
-			},
 		},
 	}
 }
@@ -100,14 +86,6 @@ func (p *pactFileV2) generateV2PactFile() *pactFileV2 {
 		_, serialisedInteraction.Request.Body, serialisedInteraction.Request.MatchingRules, _ = buildPactBody("", interaction.Request.Body, make(map[string]interface{}), "$.body", make(ruleValue), make(ruleValue))
 		_, serialisedInteraction.Response.Body, serialisedInteraction.Response.MatchingRules, _ = buildPactBody("", interaction.Response.Body, make(map[string]interface{}), "$.body", make(ruleValue), make(ruleValue))
 
-		// v2
-		// serialisedInteraction.Request.MatchingRules = requestBodyMatchingRules
-		// serialisedInteraction.Response.MatchingRules = responseBodyMatchingRules
-
-		// v3 only
-		// serialisedInteraction.Request.MatchingRules.Body = requestBodyMatchingRules
-		// serialisedInteraction.Response.MatchingRules.Body = responseBodyMatchingRules
-
 		// TODO
 		buildPactHeaders()
 		buildPactQuery()