aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-07 19:18:48 +0800
committerobscuren <geffobscura@gmail.com>2014-11-07 19:18:48 +0800
commit429dd2a100f3b9e2b612b59bcb48f79a805cd6f9 (patch)
treec91fee673e461a192d4d783193c8ddbead4a97d2 /p2p
parent48488017e498916c81122c01cfe1880afdd00d48 (diff)
downloadgo-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.gz
go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.zst
go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.zip
Implemented new miner w/ ui interface for merged mining. Closes #177
* Miner has been rewritten * Added new miner pane * Added option for local txs * Added option to read from MergeMining contract and list them for merged mining
Diffstat (limited to 'p2p')
-rw-r--r--p2p/connection.go2
-rw-r--r--p2p/message.go2
-rw-r--r--p2p/messenger_test.go3
3 files changed, 4 insertions, 3 deletions
diff --git a/p2p/connection.go b/p2p/connection.go
index e999cbe55..be366235d 100644
--- a/p2p/connection.go
+++ b/p2p/connection.go
@@ -6,7 +6,7 @@ import (
"net"
"time"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethutil"
)
type Connection struct {
diff --git a/p2p/message.go b/p2p/message.go
index 4886eaa1f..446e74dff 100644
--- a/p2p/message.go
+++ b/p2p/message.go
@@ -2,7 +2,7 @@ package p2p
import (
// "fmt"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethutil"
)
type MsgCode uint8
diff --git a/p2p/messenger_test.go b/p2p/messenger_test.go
index bc21d34ba..472d74515 100644
--- a/p2p/messenger_test.go
+++ b/p2p/messenger_test.go
@@ -3,9 +3,10 @@ package p2p
import (
// "fmt"
"bytes"
- "github.com/ethereum/eth-go/ethutil"
"testing"
"time"
+
+ "github.com/ethereum/go-ethereum/ethutil"
)
func setupMessenger(handlers Handlers) (*TestNetworkConnection, chan *PeerError, *Messenger) {