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

Fix error message #265

Merged
merged 5 commits into from
Dec 17, 2021
Merged

Fix error message #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
436f589
Fix error message
jordanschalm Dec 16, 2021
7f963a2
generate assets
jordanschalm Dec 16, 2021
5bd6742
make ci
jordanschalm Dec 16, 2021
832c9f7
make ci
jordanschalm Dec 16, 2021
c3c401d
update version in build_crypto_dependency
jordanschalm Dec 17, 2021
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
4 changes: 2 additions & 2 deletions contracts/FlowIDTableStaking.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ pub contract FlowIDTableStaking {
/// Returns the list of node IDs whose rewards will be reduced in the next payment
pub fun getNonOperationalNodesList(): {String: UFix64} {
return self.account.copy<{String: UFix64}>(from: /storage/idTableNonOperationalNodesList)
?? panic("could not get approved list")
?? panic("could not get non-operational node list")
}

/// Gets the minimum stake requirements for all the node types
Expand Down Expand Up @@ -1428,4 +1428,4 @@ pub contract FlowIDTableStaking {
self.account.save(<-create Admin(), to: self.StakingAdminStoragePath)
}
}


6 changes: 3 additions & 3 deletions lib/go/contracts/internal/assets/assets.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/go/test/build_crypto_dependency.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go get github.com/onflow/flow-go/crypto

# the version of flow-go/crypto used for now is v0.21.3.
# till the script is automatized, the version is hardcoded.
VERSION="v0.21.3"
VERSION="v0.23.3"
PKG_DIR="${GOPATH}/pkg/mod/github.com/onflow/flow-go/crypto@${VERSION}"

# grant permissions if not existant
Expand Down
2 changes: 1 addition & 1 deletion lib/go/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/onflow/flow-ft/lib/go/templates v0.2.0
github.com/onflow/flow-go v0.21.1-0.20210917140310-6b187613e108
github.com/onflow/flow-go-sdk v0.21.0
github.com/onflow/flow-go/crypto v0.21.3
github.com/onflow/flow-go/crypto v0.23.3
github.com/stretchr/testify v1.7.0
)

Expand Down
4 changes: 2 additions & 2 deletions lib/go/test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ github.com/onflow/flow-go-sdk v0.21.0 h1:KRU6F80KZLD+CJLj57S2EaAPNJUx4qpFTw1Ok0A
github.com/onflow/flow-go-sdk v0.21.0/go.mod h1:2xhtzwRAeItwbHQzHiIK2gPgLDw1hNPa0xYlpvx8Gx4=
github.com/onflow/flow-go/crypto v0.12.0/go.mod h1:oXuvU0Dr4lHKgye6nHEFbBXIWNv+dBQUzoVW5Go38+o=
github.com/onflow/flow-go/crypto v0.18.0/go.mod h1:3Ah843iPyjIL+7nH9EillV3OWNptrL+DrQUbVKgg2E4=
github.com/onflow/flow-go/crypto v0.21.3 h1:gbG9N6QKC+fAo3b4x8+enK9Lzd1annaB7Hp6H8dW8Ec=
github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
github.com/onflow/flow-go/crypto v0.23.3 h1:SZbPZ5j8g+9XBcOxxo02z2jhRIP5Ni8GxJI0ycepezY=
github.com/onflow/flow-go/crypto v0.23.3/go.mod h1:Xr1B6JJi7xc4kueWsIY5RJzMRZcfNQJT6WnXr2eMgBw=
github.com/onflow/flow/protobuf/go/flow v0.1.8/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM=
github.com/onflow/flow/protobuf/go/flow v0.1.9/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM=
github.com/onflow/flow/protobuf/go/flow v0.2.0/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM=
Expand Down