From e91a077225369cd6e2f5344e39beb1612cd2d36c Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Thu, 15 Sep 2016 16:44:56 +0200
Subject: [PATCH] arch -> util/architecture
---
blockchain/filter.go | 8 ++++----
{arch => util/architecture}/constants.go | 2 +-
{arch => util/architecture}/constants_arm.go | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename {arch => util/architecture}/constants.go (76%)
rename {arch => util/architecture}/constants_arm.go (71%)
diff --git a/blockchain/filter.go b/blockchain/filter.go
index 4f7d7863..518eb761 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 493785cf..fb03311c 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 58a7252e..5f8c9cc8 100644
--- a/arch/constants_arm.go
+++ b/util/architecture/constants_arm.go
@@ -1,4 +1,4 @@
-package arch
+package architecture
import "math"
--
GitLab