Update to go 1.21 (#169)

* Updated go version to 1.21 * Removed build folder
DecentralCardGame · Oct 15, 2023 · d6cee49 · d6cee49
1 parent 18e6955
commit d6cee49
Show file tree

Hide file tree

Showing 22 changed files with 168 additions and 25 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/DecentralCardGame/Cardchain
 
-go 1.20
+go 1.21
 
 require (
 	cosmossdk.io/errors v1.0.0-beta.7

diff --git a/go.sum b/go.sum
diff --git a/scripts/requester/go.mod b/scripts/requester/go.mod
@@ -1,6 +1,8 @@
 module github.com/DecentralCardGame/scripts/requester
 
-go 1.20
+go 1.21
+
+toolchain go1.21.3
 
 replace github.com/DecentralCardGame/Cardchain => ../../../Cardchain
 

diff --git a/scripts/requester/go.sum b/scripts/requester/go.sum
@@ -643,6 +643,7 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aws/aws-sdk-go v1.40.45 h1:QN1nsY27ssD/JmW4s83qmSb+uL6DG4GmCDzjmJB4xUI=
 github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go-v2 v1.9.1 h1:ZbovGV/qo40nrOJ4q8G33AGICzaPI45FHQWJ9650pF4=
 github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc=
@@ -1193,6 +1194,7 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-getter v1.6.1 h1:NASsgP4q6tL94WH6nJxKWj8As2H/2kop/bB1d8JMyRY=
 github.com/hashicorp/go-getter v1.6.1/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA=
+github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
 github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
 github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -1734,6 +1736,7 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYy
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA=
 github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
 github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI=

diff --git a/x/cardchain/client/cli/tx_set_card_rarity.go b/x/cardchain/client/cli/tx_set_card_rarity.go
@@ -30,8 +30,8 @@ func CmdSetCardRarity() *cobra.Command {
 				return err
 			}
 			rar, found := types.CardRarity_value[args[2]]
-			if (!found) {
-				return fmt.Errorf("Rarity has to be in %s", maps.Keys(types.CardRarity_value))
+			if !found {
+				return fmt.Errorf("rarity has to be in %s", maps.Keys(types.CardRarity_value))
 			}
 
 			argRarity := types.CardRarity(rar)

diff --git a/x/cardchain/keeper/arrays.go b/x/cardchain/keeper/arrays.go
@@ -1,8 +1,9 @@
 package keeper
 
 import (
+	"slices"
+
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
-	"golang.org/x/exp/slices"
 )
 
 func PopItemFromArr[E comparable](item E, arr []E) ([]E, error) {

diff --git a/x/cardchain/keeper/grpc_query_q_cards.go b/x/cardchain/keeper/grpc_query_q_cards.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"encoding/json"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -13,7 +14,6 @@ import (
 	"github.com/DecentralCardGame/cardobject/keywords"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/x/cardchain/keeper/grpc_query_q_matches.go b/x/cardchain/keeper/grpc_query_q_matches.go
@@ -2,8 +2,7 @@ package keeper
 
 import (
 	"context"
-
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/cardchain/keeper/grpc_query_q_sets.go b/x/cardchain/keeper/grpc_query_q_sets.go
@@ -2,10 +2,10 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/x/cardchain/keeper/match.go b/x/cardchain/keeper/match.go
@@ -2,13 +2,13 @@ package keeper
 
 import (
 	"fmt"
+	"slices"
 	"time"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 // SetMatchReporter Makes a user a match reporter

diff --git a/x/cardchain/keeper/msg_server_add_card_to_set.go b/x/cardchain/keeper/msg_server_add_card_to_set.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) AddCardToSet(goCtx context.Context, msg *types.MsgAddCardToSet) (*types.MsgAddCardToSetResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_add_contributor_to_set.go b/x/cardchain/keeper/msg_server_add_contributor_to_set.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) AddContributorToSet(goCtx context.Context, msg *types.MsgAddContributorToSet) (*types.MsgAddContributorToSetResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_commit_council_response.go b/x/cardchain/keeper/msg_server_commit_council_response.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) CommitCouncilResponse(goCtx context.Context, msg *types.MsgCommitCouncilResponse) (*types.MsgCommitCouncilResponseResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_open_booster_pack.go b/x/cardchain/keeper/msg_server_open_booster_pack.go
@@ -3,8 +3,7 @@ package keeper
 import (
 	"context"
 	"math/rand"
-
-	"golang.org/x/exp/slices"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"

diff --git a/x/cardchain/keeper/msg_server_remove_card_from_set.go b/x/cardchain/keeper/msg_server_remove_card_from_set.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) RemoveCardFromSet(goCtx context.Context, msg *types.MsgRemoveCardFromSet) (*types.MsgRemoveCardFromSetResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_reveal_council_response.go b/x/cardchain/keeper/msg_server_reveal_council_response.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) RevealCouncilResponse(goCtx context.Context, msg *types.MsgRevealCouncilResponse) (*types.MsgRevealCouncilResponseResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_set_card_rarity.go b/x/cardchain/keeper/msg_server_set_card_rarity.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors2 "github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) SetCardRarity(goCtx context.Context, msg *types.MsgSetCardRarity) (*types.MsgSetCardRarityResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_set_profile_card.go b/x/cardchain/keeper/msg_server_set_profile_card.go
@@ -2,12 +2,12 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) SetProfileCard(goCtx context.Context, msg *types.MsgSetProfileCard) (*types.MsgSetProfileCardResponse, error) {

diff --git a/x/cardchain/keeper/msg_server_transfer_booster_pack.go b/x/cardchain/keeper/msg_server_transfer_booster_pack.go
@@ -2,11 +2,11 @@ package keeper
 
 import (
 	"context"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"golang.org/x/exp/slices"
 )
 
 func (k msgServer) TransferBoosterPack(goCtx context.Context, msg *types.MsgTransferBoosterPack) (*types.MsgTransferBoosterPackResponse, error) {

diff --git a/x/cardchain/keeper/vote_right.go b/x/cardchain/keeper/vote_right.go
@@ -1,9 +1,10 @@
 package keeper
 
 import (
+	"slices"
+
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"golang.org/x/exp/slices"
 )
 
 // GetVoteReward Calculates winner rewards

diff --git a/x/cardchain/keeper/voting.go b/x/cardchain/keeper/voting.go
@@ -2,13 +2,12 @@ package keeper
 
 import (
 	"fmt"
-
-	"github.com/cosmos/cosmos-sdk/types/errors"
+	"slices"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"golang.org/x/exp/slices"
+	"github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k Keeper) voteCard(

diff --git a/x/cardchain/types/generic_type_keeper/keyworded_generic_type_keeper.go b/x/cardchain/types/generic_type_keeper/keyworded_generic_type_keeper.go
@@ -1,10 +1,11 @@
 package generic_type_keeper
 
 import (
+	"slices"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"golang.org/x/exp/slices"
 )
 
 type KeywordedGenericTypeKeeper[T codec.ProtoMarshaler] struct {