From 4309bf2a81fdaafa0e582c836b0eecc64926672e Mon Sep 17 00:00:00 2001
From: androlo <andreas@erisindustries.com>
Date: Tue, 17 Nov 2015 12:11:51 +0100
Subject: [PATCH] godep update
---
Godeps/Godeps.json | 14 +++++++-------
.../github.com/tendermint/tendermint/types/tx.go | 2 --
.../src/golang.org/x/crypto/nacl/box/box.go | 6 +++---
.../src/golang.org/x/crypto/nacl/box/box_test.go | 2 +-
.../x/crypto/nacl/secretbox/secretbox.go | 4 ++--
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index bc3b3622..4ef9ce3a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -191,31 +191,31 @@
},
{
"ImportPath": "golang.org/x/crypto/curve25519",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/crypto/nacl/box",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/crypto/nacl/secretbox",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/crypto/poly1305",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/crypto/ripemd160",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/crypto/salsa20/salsa",
- "Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/net/context",
- "Rev": "10576091dc82c9c109dddfb5ed77bdbbc87a9af8"
+ "Rev": "02a186af8b62cb007f392270669b91be5527d39c"
},
{
"ImportPath": "golang.org/x/net/netutil",
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
index ff2534e5..e6d572ab 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
@@ -4,9 +4,7 @@ import (
"encoding/json"
"errors"
"io"
-
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/ripemd160"
-
acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
index 05868b65..a940f516 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
@@ -18,9 +18,9 @@ This package is interoperable with NaCl: http://nacl.cr.yp.to/box.html.
package box
import (
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox"
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
"io"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
index dbae504e..5d48f3b0 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
@@ -10,7 +10,7 @@ import (
"encoding/hex"
"testing"
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
)
func TestSealOpen(t *testing.T) {
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
index 800cc5b5..fc4a6f5b 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
@@ -18,8 +18,8 @@ This package is interoperable with NaCl: http://nacl.cr.yp.to/secretbox.html.
package secretbox
import (
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/poly1305"
- "github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/poly1305"
+ "github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
)
// Overhead is the number of bytes of overhead when boxing a message.
--
GitLab