Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test command with latest features from Cadence testing framework #1227

Merged
merged 16 commits into from
Oct 25, 2023
Merged

Update test command with latest features from Cadence testing framework #1227

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
520e342
Incorporate latest features from cadence-tools/test module
m-Peter Oct 5, 2023
06186be
TMP: Replace dependency for cadence-tools/test and cadence-tools/lang…
m-Peter Oct 5, 2023
d933364
Include testing network to default config
m-Peter Oct 5, 2023
e081b86
Better error handling for missing testing network in config file
m-Peter Oct 6, 2023
7a5877b
Fix error handling for missing contracts in config file
m-Peter Oct 8, 2023
1706dfa
Bump version dependencies
m-Peter Oct 19, 2023
a3fcc31
Use latest master commit for cadence-tools/languageserver dependency
m-Peter Oct 20, 2023
3c32c76
Fix tests
m-Peter Oct 20, 2023
a2c01f7
Replace commit versions with tag versions for flow-emulator and caden…
m-Peter Oct 21, 2023
921e25a
Give higher priority to seed flag over random and add warning when th…
m-Peter Oct 24, 2023
bb974b8
Extract literals for meta information in JSON test reports to package…
m-Peter Oct 24, 2023
8020ee0
Simplify check for importing contracts by StringLocation
m-Peter Oct 24, 2023
5e48742
Simplify location traversal in importResolver
m-Peter Oct 24, 2023
7aef0fe
Remove error for missing testing aliases
m-Peter Oct 24, 2023
5d217a1
Update wording for seed and random flags
m-Peter Oct 24, 2023
efcba45
Move contracts map creation out of the importResolver closure
m-Peter Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions flowkit/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,11 @@ func Test_DefaultConfig(t *testing.T) {
assert.Len(t, cfg.Emulators, 1)
assert.Equal(t, cfg.Emulators[0].Name, "default")
assert.Equal(t, cfg.Emulators[0].ServiceAccount, "emulator-account")
assert.Len(t, cfg.Networks, 3)
assert.Len(t, cfg.Networks, 4)
assert.Equal(t, "emulator", cfg.Networks[0].Name)
assert.Equal(t, "testnet", cfg.Networks[1].Name)
assert.Equal(t, "mainnet", cfg.Networks[2].Name)
assert.Equal(t, "testing", cfg.Networks[1].Name)
assert.Equal(t, "testnet", cfg.Networks[2].Name)
assert.Equal(t, "mainnet", cfg.Networks[3].Name)
}

func Test_DefaultPath(t *testing.T) {
Expand Down
5 changes: 5 additions & 0 deletions flowkit/config/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ var (
Name: "emulator",
Host: "127.0.0.1:3569",
}
TestingNetwork = Network{
Name: "testing",
Host: "127.0.0.1:3569",
}
TestnetNetwork = Network{
Name: "testnet",
Host: "access.devnet.nodes.onflow.org:9000",
Expand All @@ -38,6 +42,7 @@ var (
}
DefaultNetworks = Networks{
EmulatorNetwork,
TestingNetwork,
TestnetNetwork,
MainnetNetwork,
}
Expand Down
47 changes: 27 additions & 20 deletions flowkit/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ require (
github.com/gosuri/uilive v0.0.4
github.com/invopop/jsonschema v0.7.0
github.com/lmars/go-slip10 v0.0.0-20190606092855-400ba44fee12
github.com/onflow/cadence v0.40.0
github.com/onflow/flow-emulator v0.54.1
github.com/onflow/flow-go v0.31.1-0.20230808172820-f074502a67e3
github.com/onflow/flow-go-sdk v0.41.10
github.com/onflow/cadence v0.42.0
github.com/onflow/flow-emulator v0.56.0
github.com/onflow/flow-go v0.32.2-0.20231017202518-0b275f42906c
github.com/onflow/flow-go-sdk v0.41.11
github.com/onflow/flow-go/crypto v0.24.9
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.29.0
Expand All @@ -20,14 +20,14 @@ require (
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
gonum.org/v1/gonum v0.13.0
google.golang.org/grpc v1.56.1
google.golang.org/grpc v1.58.3
)

require (
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute v1.21.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/kms v1.10.1 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/kms v1.12.1 // indirect
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -54,20 +54,21 @@ require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/go-test/deep v1.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -84,9 +85,12 @@ require (
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/k0kubun/pp/v3 v3.2.0 // indirect
github.com/kevinburke/go-bindata v3.23.0+incompatible // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-libp2p v0.28.1 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
Expand All @@ -111,7 +115,7 @@ require (
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3 // indirect
github.com/onflow/flow-ft/lib/go/contracts v0.7.0 // indirect
github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20230628215638-83439d22e0ce // indirect
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231017162044-5d0f9b6dfdb2 // indirect
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead // indirect
github.com/onflow/sdks v0.5.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand All @@ -127,6 +131,7 @@ require (
github.com/psiemens/sconfig v0.1.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/sethvargo/go-retry v0.2.3 // indirect
github.com/slok/go-http-metrics v0.10.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
Expand Down Expand Up @@ -156,17 +161,19 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.114.0 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
Expand Down
Loading
Loading