diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-21 21:36:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-21 21:36:20 +0800 |
| commit | 06697775d1edc3263a7915cee02a94bea488494c (patch) | |
| tree | 1d39f205327ee47115a7fe2947ccd5a4ba7a4073 /whisper/sort.go | |
| parent | abce6804a085087770be587e039fd4669d5eac26 (diff) | |
| parent | 069c87b960c48864dc4f1b9086adf582e1dc88a9 (diff) | |
| download | go-tangerine-06697775d1edc3263a7915cee02a94bea488494c.tar.gz go-tangerine-06697775d1edc3263a7915cee02a94bea488494c.tar.zst go-tangerine-06697775d1edc3263a7915cee02a94bea488494c.zip | |
Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into conversion
Diffstat (limited to 'whisper/sort.go')
| -rw-r--r-- | whisper/sort.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/whisper/sort.go b/whisper/sort.go index 8c5b46e9e..313ba5ac0 100644 --- a/whisper/sort.go +++ b/whisper/sort.go @@ -1,6 +1,10 @@ package whisper -import "sort" +import ( + "sort" + + "github.com/ethereum/go-ethereum/common" +) type sortedKeys struct { k []int32 @@ -10,7 +14,7 @@ func (self *sortedKeys) Len() int { return len(self.k) } func (self *sortedKeys) Less(i, j int) bool { return self.k[i] < self.k[j] } func (self *sortedKeys) Swap(i, j int) { self.k[i], self.k[j] = self.k[j], self.k[i] } -func sortKeys(m map[int32]Hash) []int32 { +func sortKeys(m map[int32]common.Hash) []int32 { sorted := new(sortedKeys) sorted.k = make([]int32, len(m)) i := 0 |