Merge pull request #2953 from oasislabs/kostko/feature/rename-transfe…

…rred-modules Update external module imports
oasisprotocol · May 28, 2020 · c6b19e5 · c6b19e5
2 parents 548ab95 + 122d430
commit c6b19e5
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 28 deletions.
diff --git a/.changelog/2953.trivial.md b/.changelog/2953.trivial.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/go/common/crypto/mrae/api/api.go b/go/common/crypto/mrae/api/api.go
@@ -10,9 +10,8 @@ import (
 	"io"
 	"testing"
 
+	curve25519 "github.com/oasisprotocol/ed25519/extra/x25519"
 	"github.com/stretchr/testify/require"
-
-	curve25519 "github.com/oasislabs/ed25519/extra/x25519"
 )
 
 // Resetable is the interface implemented by cipher.AEAD implementations

diff --git a/go/common/crypto/mrae/api/api_test.go b/go/common/crypto/mrae/api/api_test.go
@@ -4,9 +4,8 @@ import (
 	"crypto/rand"
 	"testing"
 
+	curve25519 "github.com/oasisprotocol/ed25519/extra/x25519"
 	"github.com/stretchr/testify/require"
-
-	curve25519 "github.com/oasislabs/ed25519/extra/x25519"
 )
 
 func Test_GenerateKeypair(t *testing.T) {

diff --git a/go/common/crypto/mrae/deoxysii/asymmetric.go b/go/common/crypto/mrae/deoxysii/asymmetric.go
@@ -4,7 +4,8 @@ package deoxysii
 import (
 	"crypto/sha512"
 
-	"github.com/oasislabs/deoxysii"
+	"github.com/oasisprotocol/deoxysii"
+
 	"github.com/oasislabs/oasis-core/go/common/crypto/mrae/api"
 )
 

diff --git a/go/common/crypto/mrae/deoxysii/asymmetric_test.go b/go/common/crypto/mrae/deoxysii/asymmetric_test.go
@@ -3,8 +3,8 @@ package deoxysii
 import (
 	"testing"
 
-	"github.com/oasislabs/deoxysii"
 	"github.com/oasislabs/oasis-core/go/common/crypto/mrae/api"
+	"github.com/oasisprotocol/deoxysii"
 )
 
 func TestDeoxysII_Box_Integration(t *testing.T) {

diff --git a/go/common/crypto/signature/signature.go b/go/common/crypto/signature/signature.go
@@ -16,7 +16,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/oasislabs/ed25519"
+	"github.com/oasisprotocol/ed25519"
 
 	"github.com/oasislabs/oasis-core/go/common/cbor"
 	"github.com/oasislabs/oasis-core/go/common/crypto/hash"

diff --git a/go/common/crypto/signature/signer.go b/go/common/crypto/signature/signer.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/oasislabs/ed25519"
+	"github.com/oasisprotocol/ed25519"
 )
 
 const (

diff --git a/go/common/crypto/signature/signers/file/file_signer.go b/go/common/crypto/signature/signers/file/file_signer.go
@@ -9,7 +9,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/oasislabs/ed25519"
+	"github.com/oasisprotocol/ed25519"
+
 	"github.com/oasislabs/oasis-core/go/common/crypto/signature"
 	"github.com/oasislabs/oasis-core/go/common/pem"
 )

diff --git a/go/common/crypto/signature/signers/memory/memory_signer.go b/go/common/crypto/signature/signers/memory/memory_signer.go
@@ -6,7 +6,8 @@ import (
 	"crypto/sha512"
 	"io"
 
-	"github.com/oasislabs/ed25519"
+	"github.com/oasisprotocol/ed25519"
+
 	"github.com/oasislabs/oasis-core/go/common/crypto/signature"
 )
 

diff --git a/go/go.mod b/go/go.mod
@@ -7,9 +7,9 @@ replace (
 	// https://github.com/spf13/cobra/issues/1091
 	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
 
-	github.com/tendermint/tendermint => github.com/oasislabs/tendermint v0.33.4-oasis1
-	golang.org/x/crypto/curve25519 => github.com/oasislabs/ed25519/extra/x25519 v0.0.0-20191022155220-a426dcc8ad5f
-	golang.org/x/crypto/ed25519 => github.com/oasislabs/ed25519 v0.0.0-20191109133925-b197a691e30d
+	github.com/tendermint/tendermint => github.com/oasisprotocol/tendermint v0.33.4-oasis2
+	golang.org/x/crypto/curve25519 => github.com/oasisprotocol/ed25519/extra/x25519 v0.0.0-20200528083105-55566edd6df0
+	golang.org/x/crypto/ed25519 => github.com/oasisprotocol/ed25519 v0.0.0-20200528083105-55566edd6df0
 )
 
 require (
@@ -39,8 +39,8 @@ require (
 	github.com/libp2p/go-libp2p-core v0.5.6
 	github.com/multiformats/go-multiaddr v0.2.2
 	github.com/multiformats/go-multiaddr-net v0.1.5
-	github.com/oasislabs/deoxysii v0.0.0-20190807103041-6159f99c2236
-	github.com/oasislabs/ed25519 v0.0.0-20191122104632-9d9ffc15f526
+	github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956
+	github.com/oasisprotocol/ed25519 v0.0.0-20200528083105-55566edd6df0
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/prometheus/client_golang v1.5.1
 	github.com/prometheus/common v0.9.1

diff --git a/go/go.sum b/go/go.sum
@@ -680,14 +680,14 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/oasislabs/deoxysii v0.0.0-20190807103041-6159f99c2236 h1:eTbRemVO4uAXU5RlqqQ/OiPtBcB3tBez28rV0JusKss=
-github.com/oasislabs/deoxysii v0.0.0-20190807103041-6159f99c2236/go.mod h1:gFIu170Sklo1wPRTYMTDxA664TYdgrl9NENFXfC+u3g=
-github.com/oasislabs/ed25519 v0.0.0-20191122104632-9d9ffc15f526 h1:xKlK+m6tNFucKVOP4V0GDgU4IgaLbS+HRoiVbN3W8Y4=
-github.com/oasislabs/ed25519 v0.0.0-20191122104632-9d9ffc15f526/go.mod h1:xIpCyrK2ouGA4QBGbiNbkoONrvJ00u9P3QOkXSOAC0c=
-github.com/oasislabs/safeopen v0.0.0-20200117113835-6aa648f43ff8 h1:KC7dcrx0WEeyAWGAG+vdJjmIW36PUfw1x/LUnHjLm2E=
-github.com/oasislabs/safeopen v0.0.0-20200117113835-6aa648f43ff8/go.mod h1:ABsG2IHM7bpTRIH3EvQ8CZQEBkzuhLxXFxaYApYMB9Y=
-github.com/oasislabs/tendermint v0.33.4-oasis1 h1:8jiDcQUlhzqaW1/1VxVZFRaJxEfINxoaVG3u0/SPvOc=
-github.com/oasislabs/tendermint v0.33.4-oasis1/go.mod h1:9eofOrWZ9ALr86xMSItPyZdhx8Z9Rp4liWsATu8FSrI=
+github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956 h1:etZXZf8f2xLJFivW4tTg87nSV3KLszQ7oYot3UNcmF0=
+github.com/oasisprotocol/deoxysii v0.0.0-20200527154044-851aec403956/go.mod h1:cE5EgXTIhq5oAVdZ7LZd1FjTRLALPEzv93CWzBtDkyI=
+github.com/oasisprotocol/ed25519 v0.0.0-20200528083105-55566edd6df0 h1:qmiMZ6ZhkeQZkV/Huajj+QBAu1jX0HTGsOwi+eXTGY8=
+github.com/oasisprotocol/ed25519 v0.0.0-20200528083105-55566edd6df0/go.mod h1:IZbb50w3AB72BVobEF6qG93NNSrTw/V2QlboxqSu3Xw=
+github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661 h1:MB73kGMtuMGS+6VDoU/mitzff7Cu+aZo9ta5wabuxVA=
+github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661/go.mod h1:SwBxaVibf6Sr2IZ6M3WnUue0yp8dPLAo1riQRNQ60+g=
+github.com/oasisprotocol/tendermint v0.33.4-oasis2 h1:5lb4Sl/ya0nIU13/3m4dXTVEJ9RSjd+yWPlQCAo7qgg=
+github.com/oasisprotocol/tendermint v0.33.4-oasis2/go.mod h1:7eDYPLWpDF9WjPlOIQg/azrDy/NZ7RWJQlrsQaWHv+Q=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=

diff --git a/go/oasis-test-runner/oasis/oasis_test.go b/go/oasis-test-runner/oasis/oasis_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/oasislabs/ed25519"
+	"github.com/oasisprotocol/ed25519"
 	"github.com/stretchr/testify/require"
 
 	"github.com/oasislabs/oasis-core/go/common/crypto/drbg"

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -37,7 +37,7 @@ tokio-executor = "0.1.6"
 io-context = "0.2.0"
 x25519-dalek = "0.6.0"
 ed25519-dalek = "1.0.0-pre.3"
-deoxysii = { git = "https://github.com/oasislabs/deoxysii-rust" }
+deoxysii = { git = "https://github.com/oasisprotocol/deoxysii-rust" }
 tiny-keccak = "1.4.2"
 sp800-185 = "0.2.0"
 zeroize = "0.6"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"strings"
     	"sync"
-    	"github.com/oasislabs/ed25519"
+    	"github.com/oasisprotocol/ed25519"
     )
     const (
@@ Expand Down @@