diff --git a/blockchain/filter.go b/blockchain/filter.go index 4f7d7863e400feb5187764671dec68e7dd5dcefe..518eb761b9aa42623de4b41927ec53b89e9d6cb7 100644 --- a/blockchain/filter.go +++ b/blockchain/filter.go @@ -7,10 +7,10 @@ import ( "sync" - "github.com/eris-ltd/eris-db/arch" blockchain_types "github.com/eris-ltd/eris-db/blockchain/types" core_types "github.com/eris-ltd/eris-db/core/types" "github.com/eris-ltd/eris-db/event" + "github.com/eris-ltd/eris-db/util/architecture" tendermint_types "github.com/tendermint/tendermint/types" ) @@ -48,8 +48,8 @@ func FilterBlocks(blockchain blockchain_types.Blockchain, height := blockchain.Height() if height == 0 { return &core_types.Blocks{ - MinHeight: 0, - MaxHeight: 0, + MinHeight: 0, + MaxHeight: 0, BlockMetas: []*tendermint_types.BlockMeta{}, }, nil } @@ -87,7 +87,7 @@ func (blockHeightFilter *BlockHeightFilter) Configure(fd *event.FilterData) erro if fd.Value == "min" { val = 0 } else if fd.Value == "max" { - val = arch.MaxInt32 + val = architecture.MaxInt32 } else { tv, err := strconv.ParseInt(fd.Value, 10, 0) if err != nil { diff --git a/arch/constants.go b/util/architecture/constants.go similarity index 76% rename from arch/constants.go rename to util/architecture/constants.go index 493785cf9da979dc92c9735c204a96d59d30f6ba..fb03311c6b6f1c10f6fa6b2284abb4974183d39f 100644 --- a/arch/constants.go +++ b/util/architecture/constants.go @@ -1,6 +1,6 @@ // +build !arm -package arch +package architecture import "math" diff --git a/arch/constants_arm.go b/util/architecture/constants_arm.go similarity index 71% rename from arch/constants_arm.go rename to util/architecture/constants_arm.go index 58a7252e389fd20d83a1177b0889374c1afb36be..5f8c9cc82ea360956a4206da74f69391e1bb4045 100644 --- a/arch/constants_arm.go +++ b/util/architecture/constants_arm.go @@ -1,4 +1,4 @@ -package arch +package architecture import "math"