Update to firefly-common v0.1.13

Signed-off-by: Nicko Guyer <[email protected]>
hyperledger · Jun 24, 2022 · db8cbc0 · db8cbc0
1 parent fb8020c
commit db8cbc0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/btcsuite/btcd v0.22.1
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/gorilla/mux v1.8.0
-	github.com/hyperledger/firefly-common v0.1.11
+	github.com/hyperledger/firefly-common v0.1.13
 	github.com/karlseguin/ccache v2.0.3+incompatible
 	github.com/pelletier/go-toml v1.9.5
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0

diff --git a/go.sum b/go.sum
@@ -279,8 +279,8 @@ github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hyperledger/firefly-common v0.1.11 h1:aMabZqEToUbLh1ENTAlMYN1grpubSXN+UNToK/a6Gew=
-github.com/hyperledger/firefly-common v0.1.11/go.mod h1:2NqPi5Ud9H6rSlZXkLbotxW7z4EAD89p3/8oNOpm9Gs=
+github.com/hyperledger/firefly-common v0.1.13 h1:eNK99U9FV43u1F46MM0mPuXT4Xn++orghpoTIIPsmwo=
+github.com/hyperledger/firefly-common v0.1.13/go.mod h1:2NqPi5Ud9H6rSlZXkLbotxW7z4EAD89p3/8oNOpm9Gs=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=

diff --git a/pkg/ffi2abi/ffi_param_validator_test.go b/pkg/ffi2abi/ffi_param_validator_test.go
@@ -93,7 +93,7 @@ func TestSchemaTypeInvalid(t *testing.T) {
 func TestSchemaTypeInvalidFFIType(t *testing.T) {
 	_, err := NewTestSchema(`
 {
-	"type": "number",
+	"type": "null",
 	"details": {
 		"type": "uint256"
 	}

diff --git a/pkg/ffi2abi/ffi_test.go b/pkg/ffi2abi/ffi_test.go
@@ -1003,3 +1003,12 @@ func TestInputTypeValidForTypeComponentOneOf(t *testing.T) {
 	tc, _ := param.TypeComponentTree()
 	assert.True(t, inputTypeValidForTypeComponent(context.Background(), inputType, tc))
 }
+
+func TestInputTypeValidForTypeComponentInvalid(t *testing.T) {
+	inputType := fftypes.JSONAnyPtr(`"foobar"`)
+	param := abi.Parameter{
+		Type: "bool",
+	}
+	tc, _ := param.TypeComponentTree()
+	assert.False(t, inputTypeValidForTypeComponent(context.Background(), inputType, tc))
+}