Updating to the latest rpcreflect repo

sdg0919 · Aug 7, 2019 · 6611b89 · 6611b89
1 parent 90307f6
commit 6611b89
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 25 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -537,10 +537,9 @@
   revision = "4d05e43ad98c1edcf2f52291685bd9bbc12fd2cd"
 
 [[constraint]]
-  revision = "1cefd32714820322a3b1f1f19157b69e51038fde"
+  revision = "8a53421608bbf30e65082e0210d89c2dc34d52c2"
   name = "github.com/juju/jsonschema-gen"
-  source = "github.com/SimonRichardson/jsonschema-gen"
 
 [[constraint]]
   revision = "cca922e065df403dc5088294f7f546e838d13708"
-  name = "github.com/SimonRichardson/rpcreflect"
+  name = "github.com/juju/rpcreflect"
diff --git a/apiserver/admin.go b/apiserver/admin.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/juju/clock"
 	"github.com/juju/errors"
+	"github.com/juju/rpcreflect"
 	"gopkg.in/juju/names.v2"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/api"
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"

diff --git a/apiserver/restricted_root.go b/apiserver/restricted_root.go
@@ -4,7 +4,8 @@
 package apiserver
 
 import (
-	"github.com/SimonRichardson/rpcreflect"
+	"github.com/juju/rpcreflect"
+
 	"github.com/juju/juju/rpc"
 )
 

diff --git a/apiserver/root.go b/apiserver/root.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/juju/errors"
+	"github.com/juju/rpcreflect"
 	"gopkg.in/juju/names.v2"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"

diff --git a/apiserver/root_test.go b/apiserver/root_test.go
@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/juju/clock/testclock"
+	"github.com/juju/rpcreflect"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/state"

diff --git a/apiserver/testing/fakeapi.go b/apiserver/testing/fakeapi.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/bmizerany/pat"
 	"github.com/gorilla/websocket"
+	"github.com/juju/rpcreflect"
 	"github.com/juju/utils"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver/observer"
 	"github.com/juju/juju/apiserver/observer/fakeobserver"
 	"github.com/juju/juju/rpc"

diff --git a/generate/schemagen/gen/generator.go b/generate/schemagen/gen/generator.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/juju/errors"
 	jsonschema "github.com/juju/jsonschema-gen"
+	"github.com/juju/rpcreflect"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver/facade"
 )
 

diff --git a/generate/schemagen/gen/generator_test.go b/generate/schemagen/gen/generator_test.go
@@ -7,11 +7,11 @@ import (
 
 	gomock "github.com/golang/mock/gomock"
 	jsonschema "github.com/juju/jsonschema-gen"
+	"github.com/juju/rpcreflect"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver/facade"
 )
 

diff --git a/rpc/reflect_test.go b/rpc/reflect_test.go
@@ -7,10 +7,10 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/juju/rpcreflect"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/testing"
 )
 

diff --git a/rpc/rpc_test.go b/rpc/rpc_test.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
+	"github.com/juju/rpcreflect"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/SimonRichardson/rpcreflect"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/rpc"
 	"github.com/juju/juju/rpc/jsoncodec"

diff --git a/rpc/server.go b/rpc/server.go
@@ -13,8 +13,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-
-	"github.com/SimonRichardson/rpcreflect"
+	"github.com/juju/rpcreflect"
 )
 
 const codeNotImplemented = "not implemented"