Merge pull request #100 from XinFinOrg/upgrade-websocket-imports

change to self common

Author: wjrjerome

rpc/client.go

@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 )
 
 var (

rpc/client_example_test.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/XinFinOrg/XDC-Subnet/common/hexutil"
+	"github.com/XinFinOrg/XDC-Subnet/rpc"
 )
 
 // In this example, our client wishes to track the latest 'block number'

rpc/client_test.go

@@ -31,8 +31,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/XinFinOrg/XDC-Subnet/log"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 func TestClientRequest(t *testing.T) {

rpc/endpoints.go

@@ -20,7 +20,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 )
 
 // StartIPCEndpoint starts an IPC endpoint.

rpc/handler.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 )
 
 // handler handles JSON-RPC messages. There is one handler per connection. Note that
@@ -34,21 +34,20 @@ import (
 //
 // The entry points for incoming messages are:
 //
-//    h.handleMsg(message)
-//    h.handleBatch(message)
+//	h.handleMsg(message)
+//	h.handleBatch(message)
 //
 // Outgoing calls use the requestOp struct. Register the request before sending it
 // on the connection:
 //
-//    op := &requestOp{ids: ...}
-//    h.addRequestOp(op)
+//	op := &requestOp{ids: ...}
+//	h.addRequestOp(op)
 //
 // Now send the request, then wait for the reply to be delivered through handleMsg:
 //
-//    if err := op.wait(...); err != nil {
-//        h.removeRequestOp(op) // timeout, etc.
-//    }
-//
+//	if err := op.wait(...); err != nil {
+//	    h.removeRequestOp(op) // timeout, etc.
+//	}
 type handler struct {
 	reg            *serviceRegistry
 	unsubscribeCb  *callback

rpc/ipc.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"net"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 )
 

rpc/ipc_unix.go

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
 
 package rpc
@@ -25,7 +26,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 )
 
 // ipcListen will create a Unix socket on the given endpoint.

rpc/server.go

@@ -21,8 +21,8 @@ import (
 	"io"
 	"sync/atomic"
 
+	"github.com/XinFinOrg/XDC-Subnet/log"
 	mapset "github.com/deckarep/golang-set"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 const MetadataApi = "rpc"

rpc/service.go

@@ -26,7 +26,7 @@ import (
 	"sync"
 	"unicode"
 
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/XinFinOrg/XDC-Subnet/log"
 )
 
 var (

rpc/types.go

@@ -23,8 +23,8 @@ import (
 	"math"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/XinFinOrg/XDC-Subnet/common"
+	"github.com/XinFinOrg/XDC-Subnet/common/hexutil"
 )
 
 // API describes the set of methods offered over the RPC interface