merge upstream

5 files changed, 138 insertions, 7 deletions

diff --git a/ethutil/common.go b/ethutil/common.go
index 6d88a1ed2..2fd031a20 100644
--- a/ethutil/common.go
+++ b/ethutil/common.go
@@ -3,8 +3,20 @@ package ethutil
 import (
 	"fmt"
 	"math/big"
+	"runtime"
 )
 
+func IsWindows() bool {
+	return runtime.GOOS == "windows"
+}
+
+func WindonizePath(path string) string {
+	if string(path[0]) == "/" && IsWindows() {
+		path = path[1:]
+	}
+	return path
+}
+
 // The different number of units
 var (
 	Douglas  = BigPow(10, 42)
diff --git a/ethutil/config.go b/ethutil/config.go
index c9b86100b..2f3d706fe 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -13,6 +13,7 @@ type ConfigManager struct {
 
 	ExecPath string
 	Debug    bool
+	Diff     bool
 	Paranoia bool
 
 	conf *globalconf.GlobalConf
diff --git a/ethutil/reactor.go b/ethutil/reactor.go
new file mode 100644
index 000000000..7cf145245
--- /dev/null
+++ b/ethutil/reactor.go
@@ -0,0 +1,87 @@
+package ethutil
+
+import (
+	"sync"
+)
+
+type ReactorEvent struct {
+	mut   sync.Mutex
+	event string
+	chans []chan React
+}
+
+// Post the specified reactor resource on the channels
+// currently subscribed
+func (e *ReactorEvent) Post(react React) {
+	e.mut.Lock()
+	defer e.mut.Unlock()
+
+	for _, ch := range e.chans {
+		go func(ch chan React) {
+			ch <- react
+		}(ch)
+	}
+}
+
+// Add a subscriber to this event
+func (e *ReactorEvent) Add(ch chan React) {
+	e.mut.Lock()
+	defer e.mut.Unlock()
+
+	e.chans = append(e.chans, ch)
+}
+
+// Remove a subscriber
+func (e *ReactorEvent) Remove(ch chan React) {
+	e.mut.Lock()
+	defer e.mut.Unlock()
+
+	for i, c := range e.chans {
+		if c == ch {
+			e.chans = append(e.chans[:i], e.chans[i+1:]...)
+		}
+	}
+}
+
+// Basic reactor resource
+type React struct {
+	Resource interface{}
+	Event    string
+}
+
+// The reactor basic engine. Acts as bridge
+// between the events and the subscribers/posters
+type ReactorEngine struct {
+	patterns map[string]*ReactorEvent
+}
+
+func NewReactorEngine() *ReactorEngine {
+	return &ReactorEngine{patterns: make(map[string]*ReactorEvent)}
+}
+
+// Subscribe a channel to the specified event
+func (reactor *ReactorEngine) Subscribe(event string, ch chan React) {
+	ev := reactor.patterns[event]
+	// Create a new event if one isn't available
+	if ev == nil {
+		ev = &ReactorEvent{event: event}
+		reactor.patterns[event] = ev
+	}
+
+	// Add the channel to reactor event handler
+	ev.Add(ch)
+}
+
+func (reactor *ReactorEngine) Unsubscribe(event string, ch chan React) {
+	ev := reactor.patterns[event]
+	if ev != nil {
+		ev.Remove(ch)
+	}
+}
+
+func (reactor *ReactorEngine) Post(event string, resource interface{}) {
+	ev := reactor.patterns[event]
+	if ev != nil {
+		ev.Post(React{Resource: resource, Event: event})
+	}
+}
diff --git a/ethutil/reactor_test.go b/ethutil/reactor_test.go
new file mode 100644
index 000000000..48c2f0df3
--- /dev/null
+++ b/ethutil/reactor_test.go
@@ -0,0 +1,30 @@
+package ethutil
+
+import "testing"
+
+func TestReactorAdd(t *testing.T) {
+	engine := NewReactorEngine()
+	ch := make(chan React)
+	engine.Subscribe("test", ch)
+	if len(engine.patterns) != 1 {
+		t.Error("Expected patterns to be 1, got", len(engine.patterns))
+	}
+}
+
+func TestReactorEvent(t *testing.T) {
+	engine := NewReactorEngine()
+
+	// Buffer 1, so it doesn't block for this test
+	ch := make(chan React, 1)
+	engine.Subscribe("test", ch)
+	engine.Post("test", "hello")
+
+	value := <-ch
+	if val, ok := value.Resource.(string); ok {
+		if val != "hello" {
+			t.Error("Expected Resource to be 'hello', got", val)
+		}
+	} else {
+		t.Error("Unable to cast")
+	}
+}
diff --git a/ethutil/script.go b/ethutil/script.go
index f5c53f84c..b796e7c1e 100644
--- a/ethutil/script.go
+++ b/ethutil/script.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/obscuren/mutan"
 	"github.com/obscuren/mutan/backends"
-	"github.com/obscuren/serpent-go"
 	"strings"
 )
 
@@ -15,13 +14,15 @@ func Compile(script string, silent bool) (ret []byte, err error) {
 
 		if len(line) > 1 && line[0:2] == "#!" {
 			switch line {
-			case "#!serpent":
-				byteCode, err := serpent.Compile(script)
-				if err != nil {
-					return nil, err
-				}
+			/*
+				case "#!serpent":
+					byteCode, err := serpent.Compile(script)
+					if err != nil {
+						return nil, err
+					}
 
-				return byteCode, nil
+					return byteCode, nil
+			*/
 			}
 		} else {