merged master

types/address.go

@@ -11,12 +11,13 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
+	"github.com/hashicorp/golang-lru/simplelru"
+
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/internal/conv"
 	"github.com/cosmos/cosmos-sdk/types/address"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/hashicorp/golang-lru/simplelru"
 )
 
 const (

types/address_race_test.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
+
+	"github.com/cosmos/cosmos-sdk/types"
 )
 
 // generates AccAddress with `prefix` and calls String method