Merge branch 'release/v1.7.0'

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.7.0
+# Bugfix
+- Fix GetGenesis endpoint.
 # 1.6.0
 # Added
 - Code generation for more of the http client

Makefile

@@ -13,7 +13,7 @@ build: generate
 
 unit:
 	go test $(TEST_SOURCES_NO_CUCUMBER)
-	cd test && go test --godog.strict=true --godog.format=pretty --godog.tags="@unit.offline,@unit.algod,@unit.indexer,@unit.rekey,@unit.tealsign,@unit.dryrun,@unit.responses,@unit.applications,@unit.transactions,@unit.indexer.rekey,@unit.responses.messagepack,@unit.responses.231,@unit.responses.messagepack.231" --test.v .
+	cd test && go test --godog.strict=true --godog.format=pretty --godog.tags="@unit.offline,@unit.algod,@unit.indexer,@unit.rekey,@unit.tealsign,@unit.dryrun,@unit.responses,@unit.applications,@unit.transactions,@unit.indexer.rekey,@unit.responses.messagepack,@unit.responses.231,@unit.responses.messagepack.231,@unit.responses.genesis" --test.v .
 
 integration:
 	go test $(TEST_SOURCES_NO_CUCUMBER)

client/v2/common/common.go

@@ -175,6 +175,12 @@ func (client *Client) submitForm(ctx context.Context, response interface{}, path
 
 	responseErr := extractError(resp.StatusCode, bodyBytes)
 
+	// The caller wants a string
+	if strResponse, ok := response.(*string); ok {
+		*strResponse = string(bodyBytes)
+		return err
+	}
+
 	// Attempt to unmarshal a response regardless of whether or not there was an error.
 	err = json.Unmarshal(bodyBytes, response)
 	if responseErr != nil {

test/indexer_integration_test.go

@@ -589,7 +589,11 @@ func theParsedResponseShouldEqual(jsonfileName string) error {
 	var responseJson string
 
 	baselinePath := path.Join("./features/resources/", jsonfileName)
-	responseJson = string(json.Encode(response))
+	if responseStr, ok := response.(string); ok {
+		responseJson = responseStr
+	} else {
+		responseJson = string(json.Encode(response))
+	}
 
 	return VerifyResponse(baselinePath, responseJson)
 }

test/responses_unit_test.go

@@ -140,6 +140,8 @@ func weMakeAnyCallTo(client /* algod/indexer */, endpoint string) (err error) {
 			response, err = algodC.TealDryrun(models.DryrunRequest{}).Do(context.Background())
 		case "Proof":
 			response, err = algodC.GetProof(10, "asdf").Do(context.Background())
+		case "GetGenesis":
+			response, err = algodC.GetGenesis().Do(context.Background())
 		case "any":
 			// This is an error case
 			// pickup the error as the response
@@ -169,7 +171,11 @@ func theParsedResponseShouldEqualTheMockResponse() error {
 		parts := strings.SplitAfterN(responseJson, ":", 2)
 		responseJson = parts[1]
 	} else {
-		responseJson = string(json.Encode(response))
+		if responseStr, ok := response.(string); ok {
+			responseJson = responseStr
+		} else {
+			responseJson = string(json.Encode(response))
+		}
 	}
 
 	return VerifyResponse(baselinePath, responseJson)