Merge branch 'master' into powerreduction_param

2021-04-10 16:26:50 -04:00
parent cd8186e8e4 04ab271e9a
commit 10b2b08ece
58 changed files with 1985 additions and 169 deletions
@@ -3,11 +3,12 @@ package testdata
 import (
 	"encoding/json"

+	"github.com/stretchr/testify/require"
+
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
 )

 // KeyTestPubAddr generates a new secp256k1 keypair.