From f3473312ba90b37b9a4100592a8c4d5d5bf245b7 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 31 Oct 2014 18:40:32 +0100
Subject: all: fix rename breakage

---
 pow/ar/block.go    | 4 ++--
 pow/ar/pow_test.go | 8 ++++----
 pow/ar/rnd.go      | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'pow')

diff --git a/pow/ar/block.go b/pow/ar/block.go
index 541092f7e..2124b53b4 100644
--- a/pow/ar/block.go
+++ b/pow/ar/block.go
@@ -3,10 +3,10 @@ package ar
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/ethtrie"
+	"github.com/ethereum/go-ethereum/trie"
 )
 
 type Block interface {
-	Trie() *ethtrie.Trie
+	Trie() *trie.Trie
 	Diff() *big.Int
 }
diff --git a/pow/ar/pow_test.go b/pow/ar/pow_test.go
index 3db9659e0..b1ebf9281 100644
--- a/pow/ar/pow_test.go
+++ b/pow/ar/pow_test.go
@@ -6,17 +6,17 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/ethtrie"
+	"github.com/ethereum/go-ethereum/trie"
 )
 
 type TestBlock struct {
-	trie *ethtrie.Trie
+	trie *trie.Trie
 }
 
 func NewTestBlock() *TestBlock {
 	db, _ := ethdb.NewMemDatabase()
 	return &TestBlock{
-		trie: ethtrie.New(db, ""),
+		trie: trie.New(db, ""),
 	}
 }
 
@@ -24,7 +24,7 @@ func (self *TestBlock) Diff() *big.Int {
 	return b(10)
 }
 
-func (self *TestBlock) Trie() *ethtrie.Trie {
+func (self *TestBlock) Trie() *trie.Trie {
 	return self.trie
 }
 
diff --git a/pow/ar/rnd.go b/pow/ar/rnd.go
index 7dbd99373..c62f4e062 100644
--- a/pow/ar/rnd.go
+++ b/pow/ar/rnd.go
@@ -3,7 +3,7 @@ package ar
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/ethcrypto"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethutil"
 )
 
@@ -21,16 +21,16 @@ func (self ByteNode) Big() *big.Int {
 
 func Sha3(v interface{}) *big.Int {
 	if b, ok := v.(*big.Int); ok {
-		return ethutil.BigD(ethcrypto.Sha3(b.Bytes()))
+		return ethutil.BigD(crypto.Sha3(b.Bytes()))
 	} else if b, ok := v.([]interface{}); ok {
-		return ethutil.BigD(ethcrypto.Sha3(ethutil.Encode(b)))
+		return ethutil.BigD(crypto.Sha3(ethutil.Encode(b)))
 	} else if s, ok := v.([]*big.Int); ok {
 		v := make([]interface{}, len(s))
 		for i, b := range s {
 			v[i] = b
 		}
 
-		return ethutil.BigD(ethcrypto.Sha3(ethutil.Encode(v)))
+		return ethutil.BigD(crypto.Sha3(ethutil.Encode(v)))
 	}
 
 	return nil
-- 
cgit v1.2.3