From c7b0b2c74d07661ad4a0c5167d5ea7aed5ed9ba3 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 12 Mar 2020 17:50:19 +0100 Subject: [PATCH] Pull out and generalize semverMatcher --- packages/sdk/src/restclient.spec.ts | 3 ++- packages/sdk/src/testutils.spec.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sdk/src/restclient.spec.ts b/packages/sdk/src/restclient.spec.ts index 36b6c1ce..f5a96f91 100644 --- a/packages/sdk/src/restclient.spec.ts +++ b/packages/sdk/src/restclient.spec.ts @@ -19,6 +19,7 @@ import { getRandomizedHackatom, makeRandomAddress, pendingWithoutWasmd, + semverMatcher, tendermintAddressMatcher, tendermintHeightMatcher, tendermintIdMatcher, @@ -315,7 +316,7 @@ describe("RestClient", () => { name: "wasm", server_name: "wasmd", client_name: "wasmcli", - version: jasmine.stringMatching(/^0\.7\.[0-9]+(-[a-zA-Z0-9._]+)?$/), + version: jasmine.stringMatching(semverMatcher), commit: jasmine.stringMatching(tendermintShortHashMatcher), build_tags: "netgo,ledger", go: jasmine.stringMatching(/^go version go1\.[0-9]+\.[0-9]+ linux\/amd64$/), diff --git a/packages/sdk/src/testutils.spec.ts b/packages/sdk/src/testutils.spec.ts index ce680689..be72bc0f 100644 --- a/packages/sdk/src/testutils.spec.ts +++ b/packages/sdk/src/testutils.spec.ts @@ -61,6 +61,7 @@ export const tendermintIdMatcher = /^[0-9A-F]{64}$/; export const tendermintOptionalIdMatcher = /^([0-9A-F]{64}|)$/; export const tendermintAddressMatcher = /^[0-9A-F]{40}$/; export const tendermintShortHashMatcher = /^[0-9a-f]{40}$/; +export const semverMatcher = /^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/; // https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#bech32 export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{38}$/;