Skip to content

Commit

Permalink
Update go v1.21 (#1356)
Browse files Browse the repository at this point in the history
* update go 1.21

* vite: serve ui kit assets

* fmt

* lint: goconst
  • Loading branch information
Thykof authored May 2, 2024
1 parent 44edb87 commit 0669520
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/massalabs/station

go 1.20
go 1.21

require (
fyne.io/fyne/v2 v2.3.4
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:W
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
Expand Down Expand Up @@ -466,6 +467,7 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
Expand Down
12 changes: 5 additions & 7 deletions pkg/node/sendoperation/sendoperation.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,17 @@ func Call(
func createOperationContent(operationBatch OperationBatch, description string, msgB64 string, chainID uint64) string {
var content string

//nolint:goconst
const descriptionLabel = `{"description": "`

switch {
case operationBatch.NewBatch:
content = `{
"description": "` + description + `", "operation": "` + msgB64 + `",
content = descriptionLabel + description + `", "operation": "` + msgB64 + `",
"batch": true, "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
case operationBatch.CorrelationID != "":
content = `{
"description": "` + description + `", "operation": "` + msgB64 + `",
content = descriptionLabel + description + `", "operation": "` + msgB64 + `",
"correlationId": "` + operationBatch.CorrelationID + `", "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
default:
content = `{
"description": "` + description + `",
content = descriptionLabel + description + `",
"operation": "` + msgB64 + `", "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
}

Expand Down
6 changes: 6 additions & 0 deletions web/massastation/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,11 @@ export default ({ mode }) => {
{ find: '@/shared', replacement: path.resolve(__dirname, '../shared') },
],
},
server: {
fs: {
// to allow server ui kit asset like font files
allow: ['../../..'],
},
},
});
};

0 comments on commit 0669520

Please sign in to comment.