Merge Staging Refatored

accounts/abi/event_test.go

@@ -25,6 +25,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ShyftNetwork/go-empyrean/common"
+	"github.com/ShyftNetwork/go-empyrean/crypto"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
   "anonymous": false,

accounts/usbwallet/wallet.go

@@ -25,19 +25,11 @@ import (
 	"sync"
 	"time"
 
-<<<<<<< HEAD
-	ethereum "github.com/empyrean/go-ethereum"
-	"github.com/empyrean/go-ethereum/accounts"
-	"github.com/empyrean/go-ethereum/common"
-	"github.com/empyrean/go-ethereum/core/types"
-	"github.com/empyrean/go-ethereum/log"
-=======
 	ethereum "github.com/ShyftNetwork/go-empyrean"
 	"github.com/ShyftNetwork/go-empyrean/accounts"
 	"github.com/ShyftNetwork/go-empyrean/common"
 	"github.com/ShyftNetwork/go-empyrean/core/types"
 	"github.com/ShyftNetwork/go-empyrean/log"
->>>>>>> shftBlock_rename
 	"github.com/karalabe/hid"
 )
 

build/env.sh

@@ -10,11 +10,11 @@ fi
 # Create fake Go workspace if it doesn't exist yet.
 workspace="$PWD/build/_workspace"
 root="$PWD"
-ethdir="$workspace/src/github.com/ethereum"
+ethdir="$workspace/src/github.com/ShyftNetwork"
-if [ ! -L "$ethdir/go-ethereum" ]; then
+if [ ! -L "$ethdir/go-empyrean" ]; then
     mkdir -p "$ethdir"
     cd "$ethdir"
-    ln -s ../../../../../. go-ethereum
+    ln -s ../../../../../. go-empyrean
     cd "$root"
 fi
 
@@ -23,8 +23,8 @@ GOPATH="$workspace"
 export GOPATH
 
 # Run the command inside the workspace.
-cd "$ethdir/go-ethereum"
+cd "$ethdir/go-empyrean"
-PWD="$ethdir/go-ethereum"
+PWD="$ethdir/go-empyrean"
 
 # Launch the arguments with the configured environment.
 exec "$@"

cmd/swarm/upload.go

@@ -30,13 +30,8 @@ import (
 	"path/filepath"
 	"strings"
 
-<<<<<<< HEAD
-	"github.com/empyrean/go-ethereum/cmd/utils"
-	swarm "github.com/empyrean/go-ethereum/swarm/api/client"
-=======
 	"github.com/ShyftNetwork/go-empyrean/cmd/utils"
 	swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client"
->>>>>>> shftBlock_rename
 	"gopkg.in/urfave/cli.v1"
 )
 

core/bench_test.go

@@ -23,16 +23,6 @@ import (
 	"os"
 	"testing"
 
-<<<<<<< HEAD
-	"github.com/empyrean/go-ethereum/common"
-	"github.com/empyrean/go-ethereum/common/math"
-	"github.com/empyrean/go-ethereum/consensus/ethash"
-	"github.com/empyrean/go-ethereum/core/types"
-	"github.com/empyrean/go-ethereum/core/vm"
-	"github.com/empyrean/go-ethereum/crypto"
-	"github.com/empyrean/go-ethereum/ethdb"
-	"github.com/empyrean/go-ethereum/params"
-=======
 	"github.com/ShyftNetwork/go-empyrean/common"
 	"github.com/ShyftNetwork/go-empyrean/common/math"
 	"github.com/ShyftNetwork/go-empyrean/consensus/ethash"
@@ -41,7 +31,6 @@ import (
 	"github.com/ShyftNetwork/go-empyrean/crypto"
 	"github.com/ShyftNetwork/go-empyrean/ethdb"
 	"github.com/ShyftNetwork/go-empyrean/params"
->>>>>>> shftBlock_rename
 )
 
 func BenchmarkInsertChain_empty_memdb(b *testing.B) {

core/vm/gen_structlog.go

@@ -6,15 +6,9 @@ import (
 	"encoding/json"
 	"math/big"
 
-<<<<<<< HEAD
-	"github.com/empyrean/go-ethereum/common"
-	"github.com/empyrean/go-ethereum/common/hexutil"
-	"github.com/empyrean/go-ethereum/common/math"
-=======
 	"github.com/ShyftNetwork/go-empyrean/common"
 	"github.com/ShyftNetwork/go-empyrean/common/hexutil"
 	"github.com/ShyftNetwork/go-empyrean/common/math"
->>>>>>> shftBlock_rename
 )
 
 var _ = (*structLogMarshaling)(nil)

rpc/client_example_test.go

@@ -22,11 +22,7 @@ import (
 	"math/big"
 	"time"
 
-<<<<<<< HEAD
-	"github.com/empyrean/go-ethereum/rpc"
-=======
 	"github.com/ShyftNetwork/go-empyrean/rpc"
->>>>>>> shftBlock_rename
 )
 
 // In this example, our client whishes to track the latest 'block number'