From d08446c5ad1c3523f1ba05255e38b9eda395408e Mon Sep 17 00:00:00 2001
From: Alberto Cortés <alcortesm@gmail.com>
Date: Mon, 13 Feb 2017 16:04:41 +0100
Subject: simplify noder mocks in test (#265)

---
 utils/merkletrie/internal/frame/frame_test.go | 11 ++---------
 utils/merkletrie/iter_test.go                 | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'utils/merkletrie')

diff --git a/utils/merkletrie/internal/frame/frame_test.go b/utils/merkletrie/internal/frame/frame_test.go
index 9cc0994..516d78b 100644
--- a/utils/merkletrie/internal/frame/frame_test.go
+++ b/utils/merkletrie/internal/frame/frame_test.go
@@ -89,20 +89,13 @@ func checkFirstAndDrop(c *C, f *Frame, expectedNodeName string, expectedOK bool)
 }
 
 // a mock noder that returns error when Children() is called
-type errorNoder struct{}
+type errorNoder struct{ noder.Noder }
 
-func (e *errorNoder) Hash() []byte   { return nil }
-func (e *errorNoder) Name() string   { return "" }
-func (e *errorNoder) String() string { return "" }
-func (e *errorNoder) IsDir() bool    { return true }
 func (e *errorNoder) Children() ([]noder.Noder, error) {
 	return nil, fmt.Errorf("mock error")
 }
-func (e *errorNoder) NumChildren() (int, error) {
-	return 0, fmt.Errorf("mock error")
-}
 
 func (s *FrameSuite) TestNewFrameErrors(c *C) {
 	_, err := New(&errorNoder{})
-	c.Assert(err, Not(IsNil))
+	c.Assert(err, ErrorMatches, "mock error")
 }
diff --git a/utils/merkletrie/iter_test.go b/utils/merkletrie/iter_test.go
index c1900da..fa7c5f5 100644
--- a/utils/merkletrie/iter_test.go
+++ b/utils/merkletrie/iter_test.go
@@ -440,20 +440,13 @@ func find(c *C, tree noder.Noder, name string) noder.Path {
 	}
 }
 
-type errorNoder struct{}
+type errorNoder struct{ noder.Noder }
 
-func (e *errorNoder) Name() string   { return "" }
-func (e *errorNoder) String() string { return "" }
-func (e *errorNoder) Hash() []byte   { return nil }
-func (e *errorNoder) IsDir() bool    { return true }
 func (e *errorNoder) Children() ([]noder.Noder, error) {
 	return nil, fmt.Errorf("mock error")
 }
-func (e *errorNoder) NumChildren() (int, error) {
-	return 0, fmt.Errorf("mock error")
-}
 
 func (s *IterSuite) TestNewIterFailsOnChildrenErrors(c *C) {
 	_, err := merkletrie.NewIter(&errorNoder{})
-	c.Assert(err, Not(IsNil))
+	c.Assert(err, ErrorMatches, "mock error")
 }
-- 
cgit