Move mux PRC package

leventeliu · leventeliu · commit bbf3fe7a53dd · 2019-03-25T20:15:01.000+08:00
diff --git a/blockproducer/chain.go b/blockproducer/chain.go
@@ -37,7 +37,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	xi "github.com/CovenantSQL/CovenantSQL/xenomint/interfaces"
diff --git a/blockproducer/chain_test.go b/blockproducer/chain_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 )
 
diff --git a/blockproducer/config.go b/blockproducer/config.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 )
 
diff --git a/client/conn.go b/client/conn.go
@@ -30,7 +30,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	"github.com/CovenantSQL/CovenantSQL/utils/trace"
diff --git a/client/driver.go b/client/driver.go
@@ -37,7 +37,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/client/helper_test.go b/client/helper_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/cmd/cql-faucet/api.go b/cmd/cql-faucet/api.go
@@ -37,7 +37,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
diff --git a/cmd/cql-minerd/dbms.go b/cmd/cql-minerd/dbms.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/worker"
 )
 
diff --git a/cmd/cql-minerd/integration_test.go b/cmd/cql-minerd/integration_test.go
@@ -46,7 +46,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/test"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
@@ -801,7 +801,7 @@ func benchMiner(b *testing.B, minerCount uint16) {
 		// create
 		meta := client.ResourceMeta{
 			ResourceMeta: types.ResourceMeta{
-				Node: minerCount,
+				Node:                   minerCount,
 				UseEventualConsistency: benchEventualConsistency,
 			},
 		}
diff --git a/cmd/cql-minerd/main.go b/cmd/cql-minerd/main.go
@@ -34,7 +34,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/metric"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 	_ "github.com/CovenantSQL/CovenantSQL/utils/log/debug"
diff --git a/cmd/cql-minerd/node.go b/cmd/cql-minerd/node.go
@@ -27,7 +27,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/cmd/cql-minerd/provide_service.go b/cmd/cql-minerd/provide_service.go
@@ -26,7 +26,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
diff --git a/cmd/cql-utils/rpc.go b/cmd/cql-utils/rpc.go
@@ -34,7 +34,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/sqlchain"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/cmd/cqld/adapter.go b/cmd/cqld/adapter.go
@@ -29,7 +29,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/storage"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/cmd/cqld/bench_test.go b/cmd/cqld/bench_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
diff --git a/cmd/cqld/bootstrap.go b/cmd/cqld/bootstrap.go
@@ -30,7 +30,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/cmd/cqld/cqld_test.go b/cmd/cqld/cqld_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/test"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
diff --git a/kayak/runtime_test.go b/kayak/runtime_test.go
@@ -41,7 +41,7 @@ import (
 	kt "github.com/CovenantSQL/CovenantSQL/kayak/types"
 	kl "github.com/CovenantSQL/CovenantSQL/kayak/wal"
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	crpc "github.com/CovenantSQL/CovenantSQL/rpc"
+	crpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/storage"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/kayak/utils.go b/kayak/utils.go
@@ -21,7 +21,7 @@ import (
 
 	kt "github.com/CovenantSQL/CovenantSQL/kayak/types"
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 )
 
 func (r *Runtime) getCaller(id proto.NodeID) Caller {
diff --git a/metric/rpc.go b/metric/rpc.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/metric/rpc_test.go b/metric/rpc_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/rpc/mux/client.go b/rpc/mux/client.go
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-// Package rpc provides RPC Client/Server functions.
-package rpc
+// Package mux provides RPC Client/Server functions.
+package mux
 
 import (
 	"net"
diff --git a/rpc/mux/client_test.go b/rpc/mux/client_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"net"
diff --git a/rpc/mux/codec.go b/rpc/mux/codec.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"context"
diff --git a/rpc/mux/leak_test.go b/rpc/mux/leak_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"os"
diff --git a/rpc/mux/pool.go b/rpc/mux/pool.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"net"
diff --git a/rpc/mux/pool_test.go b/rpc/mux/pool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"net"
diff --git a/rpc/mux/rpcutil.go b/rpc/mux/rpcutil.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"context"
diff --git a/rpc/mux/rpcutil_test.go b/rpc/mux/rpcutil_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"context"
diff --git a/rpc/mux/server.go b/rpc/mux/server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"context"
diff --git a/rpc/mux/server_test.go b/rpc/mux/server_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"net"
diff --git a/rpc/mux/sharedsecret.go b/rpc/mux/sharedsecret.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rpc
+package mux
 
 import (
 	"sync"
diff --git a/sqlchain/chain.go b/sqlchain/chain.go
@@ -38,7 +38,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/sqlchain/chain_test.go b/sqlchain/chain_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/sqlchain/mux.go b/sqlchain/mux.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 )
 
 // MuxService defines multiplexing service of sql-chain.
diff --git a/sqlchain/observer/observation_test.go b/sqlchain/observer/observation_test.go
@@ -45,7 +45,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/test"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
diff --git a/sqlchain/observer/observer.go b/sqlchain/observer/observer.go
@@ -22,7 +22,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/sqlchain/observer/service.go b/sqlchain/observer/service.go
@@ -31,7 +31,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/test/helper.go b/test/helper.go
@@ -28,7 +28,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 )
 
diff --git a/twopc/twopc_test.go b/twopc/twopc_test.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/CovenantSQL/CovenantSQL/crypto/etls"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
diff --git a/worker/chainbusservice.go b/worker/chainbusservice.go
@@ -27,7 +27,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/chainbus"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
diff --git a/worker/chainbusservice_test.go b/worker/chainbusservice_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 )
 
diff --git a/worker/db_test.go b/worker/db_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
 	"github.com/CovenantSQL/CovenantSQL/proto"
-	"github.com/CovenantSQL/CovenantSQL/rpc"
+	rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
 	"github.com/CovenantSQL/CovenantSQL/sqlchain"
 	"github.com/CovenantSQL/CovenantSQL/types"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
diff --git a/worker/dbms_config.go b/worker/dbms_config.go
diff --git a/worker/dbms_mux.go b/worker/dbms_mux.go
diff --git a/worker/dbms_rpc.go b/worker/dbms_rpc.go
diff --git a/worker/dbms_test.go b/worker/dbms_test.go
diff --git a/worker/helper_test.go b/worker/helper_test.go
diff --git a/xenomint/mux.go b/xenomint/mux.go
diff --git a/xenomint/mux_test.go b/xenomint/mux_test.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`"github.com/CovenantSQL/CovenantSQL/crypto/hash"`
`33`	`33`	`"github.com/CovenantSQL/CovenantSQL/crypto/kms"`
`34`	`34`	`"github.com/CovenantSQL/CovenantSQL/proto"`
`35`		`- "github.com/CovenantSQL/CovenantSQL/rpc"`
	`35`	`+ rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"`
`36`	`36`	`"github.com/CovenantSQL/CovenantSQL/types"`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"time"`
`21`	`21`
`22`	`22`	`"github.com/CovenantSQL/CovenantSQL/proto"`
`23`		`- "github.com/CovenantSQL/CovenantSQL/rpc"`
	`23`	`+ rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"`
`24`	`24`	`"github.com/CovenantSQL/CovenantSQL/types"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import (`
`37`	`37`	`"github.com/CovenantSQL/CovenantSQL/crypto/kms"`
`38`	`38`	`"github.com/CovenantSQL/CovenantSQL/proto"`
`39`	`39`	`"github.com/CovenantSQL/CovenantSQL/route"`
`40`		`- "github.com/CovenantSQL/CovenantSQL/rpc"`
	`40`	`+ rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"`
`41`	`41`	`"github.com/CovenantSQL/CovenantSQL/types"`
`42`	`42`	`"github.com/CovenantSQL/CovenantSQL/utils/log"`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/CovenantSQL/CovenantSQL/conf"`
`23`	`23`	`"github.com/CovenantSQL/CovenantSQL/crypto/hash"`
`24`		`- "github.com/CovenantSQL/CovenantSQL/rpc"`
	`24`	`+ rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"`
`25`	`25`	`"github.com/CovenantSQL/CovenantSQL/worker"`
`26`	`26`	`)`
`27`	`27`