tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: drop accessors for Value.Val

Browse Source 
I don't see why we would need two different accessors for a public field.
This commit is contained in:
Felix Lange 2015-03-20 13:33:11 +01:00
parent dcb9614dfe
commit c161d73d42
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/rlp.go
View File

@ -112,7 +112,7 @@ func Encode(object interface{}) []byte {
if object != nil { if object != nil {
switch t := object.(type) { switch t := object.(type) {
case *Value: case *Value:
buff.Write(Encode(t.Raw())) buff.Write(Encode(t.Val))
case RlpEncodable: case RlpEncodable:
buff.Write(Encode(t.RlpData())) buff.Write(Encode(t.RlpData()))
// Code dup :-/ // Code dup :-/

8
common/value.go
View File

@ -57,14 +57,6 @@ func (val *Value) Len() int {
return len(val.Bytes()) return len(val.Bytes())
} }
func (val *Value) Raw() interface{} {
return val.Val
}
func (val *Value) Interface() interface{} {
return val.Val
}
func (val *Value) Uint() uint64 { func (val *Value) Uint() uint64 {
if Val, ok := val.Val.(uint8); ok { if Val, ok := val.Val.(uint8); ok {
return uint64(Val) return uint64(Val)

2
common/value_test.go
View File

@ -35,7 +35,7 @@ func (s *ValueSuite) TestValueTypes(c *checker.C) {
c.Assert(str.Str(), checker.Equals, strExp) c.Assert(str.Str(), checker.Equals, strExp)
c.Assert(num.Uint(), checker.Equals, numExp) c.Assert(num.Uint(), checker.Equals, numExp)
c.Assert(NewValue(inter.Interface()).Cmp(NewValue(interExp)), checker.Equals, true) c.Assert(NewValue(inter.Val).Cmp(NewValue(interExp)), checker.Equals, true)
c.Assert(byt.Bytes(), checker.DeepEquals, bytExp) c.Assert(byt.Bytes(), checker.DeepEquals, bytExp)
c.Assert(bigInt.BigInt(), checker.DeepEquals, bigExp) c.Assert(bigInt.BigInt(), checker.DeepEquals, bigExp)
} }

2
ethdb/memory_database.go
View File

@ -49,7 +49,7 @@ func (db *MemDatabase) Print() {
for key, val := range db.db { for key, val := range db.db {
fmt.Printf("%x(%d): ", key, len(key)) fmt.Printf("%x(%d): ", key, len(key))
node := common.NewValueFromBytes(val) node := common.NewValueFromBytes(val)
fmt.Printf("%q\n", node.Interface()) fmt.Printf("%q\n", node.Val)
} }
} }