gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Browse Source
This commit is contained in:
obscuren
2014-11-01 01:18:13 +01:00
parent 141d3caabb 394e0f60c2
commit c8438979a9
15 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chain/bloom9_test.go
View File

@@ -3,12 +3,14 @@ package chain
import (
"testing"
"github.com/ethereum/go-ethereum/vm"
"github.com/ethereum/go-ethereum/state"
)
func TestBloom9(t *testing.T) {
testCase := []byte("testtest")
bin := LogsBloom([]vm.Log{vm.Log{testCase, [][]byte{[]byte("hellohello")}, nil}}).Bytes()
bin := LogsBloom([]state.Log{
{testCase, [][]byte{[]byte("hellohello")}, nil},
}).Bytes()
res := BloomLookup(bin, testCase)
if !res {

10
chain/helper_test.go
View File

@@ -4,11 +4,11 @@ import (
"container/list"
"fmt"
"github.com/ethereum/go-ethereum/ethcrypto"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ethwire"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/wire"
)
// Implement our EthTest Manager
@@ -53,14 +53,14 @@ func (tm *TestManager) StateManager() *StateManager {
func (tm *TestManager) EventMux() *event.TypeMux {
return tm.eventMux
}
func (tm *TestManager) Broadcast(msgType ethwire.MsgType, data []interface{}) {
func (tm *TestManager) Broadcast(msgType wire.MsgType, data []interface{}) {
fmt.Println("Broadcast not implemented")
}
func (tm *TestManager) ClientIdentity() ethwire.ClientIdentity {
func (tm *TestManager) ClientIdentity() wire.ClientIdentity {
return nil
}
func (tm *TestManager) KeyManager() *ethcrypto.KeyManager {
func (tm *TestManager) KeyManager() *crypto.KeyManager {
return nil
}