Merge pull request hyperledger#79 from kaleido-io/fixes

fix token pool creation for 1.3.0

internal/perf/token_pool.go

@@ -18,6 +18,7 @@ package perf
 
 import (
 	"errors"
+	"fmt"
 	"net/url"
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
@@ -43,13 +44,15 @@ func (pr *perfRunner) CreateTokenPool() error {
 	if pr.cfg.TokenOptions.Config.PoolBlockNumber != "" {
 		config["blockNumber"] = pr.cfg.TokenOptions.Config.PoolBlockNumber
 	}
-	fullPath, err := url.JoinPath(pr.client.BaseURL, pr.cfg.FFNamespacePath, "tokens/pools?confirm=true")
+	fullPath, err := url.JoinPath(pr.client.BaseURL, pr.cfg.FFNamespacePath, "tokens/pools")
 	if err != nil {
 		return err
 	}
+
+	url := fmt.Sprintf("%s?confirm=true&publish=true", fullPath)
 	res, err := pr.client.R().
 		SetBody(&body).
-		Post(fullPath)
+		Post(url)
 
 	if err != nil || !res.IsSuccess() {
 		return errors.New("Failed to create token pool")

scripts/prep.sh

@@ -80,7 +80,7 @@ printf ${PURPLE}"Deploying custom test contract...\n${NC}"
 
 TESTS='{"name": "msg_broadcast", "workers":50},{"name": "msg_private", "workers":50},{"name": "blob_broadcast", "workers":30},{"name": "blob_private", "workers":30}'
 
-if [ "$BLOCKCHAIN_PROVIDER" == "geth" ]; then
+if [ "$BLOCKCHAIN_PROVIDER" = "geth" ] || [ "$BLOCKCHAIN_PROVIDER" = "besu" ]; then
     output=$(${FF_CLI} deploy ethereum $NEW_STACK_NAME ./firefly/test/data/contracts/simplestorage/simple_storage.json | jq -r '.address')
     prefix='contract address: '
     CONTRACT_ADDRESS=${output#"$prefix"}