From 5843c0bc66b62872cb59c1cf8a512f3680fdcd58 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Wed, 27 May 2015 10:09:22 -0400 Subject: [PATCH] Move legacy under internal directory. After Go 1.5, this will prevent consumers from importing these packages since they are currently unmaintained. Closes #232. --- config.go | 2 +- {legacy => internal/legacy}/keystore/keystore.go | 2 +- {legacy => internal/legacy}/keystore/keystore_test.go | 0 {legacy => internal/legacy}/rename/rename_unix.go | 0 {legacy => internal/legacy}/rename/rename_windows.go | 0 walletsetup.go | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {legacy => internal/legacy}/keystore/keystore.go (99%) rename {legacy => internal/legacy}/keystore/keystore_test.go (100%) rename {legacy => internal/legacy}/rename/rename_unix.go (100%) rename {legacy => internal/legacy}/rename/rename_windows.go (100%) diff --git a/config.go b/config.go index e035a13..e822cfe 100644 --- a/config.go +++ b/config.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/legacy/keystore" + "github.com/btcsuite/btcwallet/internal/legacy/keystore" flags "github.com/btcsuite/go-flags" ) diff --git a/legacy/keystore/keystore.go b/internal/legacy/keystore/keystore.go similarity index 99% rename from legacy/keystore/keystore.go rename to internal/legacy/keystore/keystore.go index 7853d09..c2b716c 100644 --- a/legacy/keystore/keystore.go +++ b/internal/legacy/keystore/keystore.go @@ -39,7 +39,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/legacy/rename" + "github.com/btcsuite/btcwallet/internal/legacy/rename" "github.com/btcsuite/golangcrypto/ripemd160" ) diff --git a/legacy/keystore/keystore_test.go b/internal/legacy/keystore/keystore_test.go similarity index 100% rename from legacy/keystore/keystore_test.go rename to internal/legacy/keystore/keystore_test.go diff --git a/legacy/rename/rename_unix.go b/internal/legacy/rename/rename_unix.go similarity index 100% rename from legacy/rename/rename_unix.go rename to internal/legacy/rename/rename_unix.go diff --git a/legacy/rename/rename_windows.go b/internal/legacy/rename/rename_windows.go similarity index 100% rename from legacy/rename/rename_windows.go rename to internal/legacy/rename/rename_windows.go diff --git a/walletsetup.go b/walletsetup.go index ccf5315..6ad060c 100644 --- a/walletsetup.go +++ b/walletsetup.go @@ -30,7 +30,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/legacy/keystore" + "github.com/btcsuite/btcwallet/internal/legacy/keystore" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb"