Merge pull request #23 from spacemeshos/update-go-1.20

Update to go 1.20
spacemeshos · Sep 7, 2023 · bcb6698 · bcb6698
2 parents fd846de + 6c2c6d8
commit bcb6698
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/spacemeshos/economics
 
-go 1.19
+go 1.20
 
 require (
 	github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05

diff --git a/rewards/rewards.go b/rewards/rewards.go
@@ -1,10 +1,11 @@
 package rewards
 
 import (
+	"log"
+
 	"github.com/spacemeshos/economics/constants"
 
 	"github.com/ericlagergren/decimal"
-	"log"
 )
 
 var (

diff --git a/rewards/rewards_test.go b/rewards/rewards_test.go
@@ -1,11 +1,12 @@
 package rewards
 
 import (
+	"math"
+	"testing"
+
 	"github.com/ericlagergren/decimal"
 	"github.com/spacemeshos/economics/constants"
 	"github.com/stretchr/testify/assert"
-	"math"
-	"testing"
 )
 
 func Test_Lambda(t *testing.T) {

diff --git a/sim.go b/sim.go
@@ -3,6 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
+	"log"
+	"os"
+	"strconv"
+	"time"
+
 	"github.com/spacemeshos/economics/constants"
 	"github.com/spacemeshos/economics/rewards"
 	"github.com/spacemeshos/economics/vesting"
@@ -13,15 +18,9 @@ import (
 	"github.com/tcnksm/go-input"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
-	"log"
-	"os"
-	"strconv"
-	"time"
 )
 
-var (
-	qFlag = flag.Bool("q", false, "quiet mode (noninteractive)")
-)
+var qFlag = flag.Bool("q", false, "quiet mode (noninteractive)")
 
 func main() {
 	// parse flags
@@ -145,9 +144,7 @@ const (
 	defaultEndLayer       = 10 * constants.OneYear
 )
 
-var (
-	defaultGenesisDate, _ = time.Parse("20060102", defaultGenesisDateStr)
-)
+var defaultGenesisDate, _ = time.Parse("20060102", defaultGenesisDateStr)
 
 func getParams() (time.Time, uint32, uint32) {
 	// short-circuit UI in quiet mode

diff --git a/vesting/vesting.go b/vesting/vesting.go
@@ -1,8 +1,9 @@
 package vesting
 
 import (
-	"github.com/spacemeshos/economics/constants"
 	"log"
+
+	"github.com/spacemeshos/economics/constants"
 )
 
 func AccumulatedVestAtLayer(layersAfterEffectiveGenesis uint32) uint64 {

diff --git a/vesting/vesting_test.go b/vesting/vesting_test.go
@@ -1,9 +1,10 @@
 package vesting
 
 import (
+	"testing"
+
 	"github.com/spacemeshos/economics/constants"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Genesis(t *testing.T) {