From c3da98f4244407adf6792dbc2a66f7c6c5827da6 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 25 Apr 2018 08:29:00 +0200 Subject: [PATCH] update structure --- client/client.go | 2 +- client/client.internal.go | 6 +++--- cmd/server/server.go | 2 +- internal/keyset/keyset.go | 2 +- {util => internal}/scha/hash.go | 2 +- {util => internal}/scha/hash_test.go | 0 {util => internal}/timeid/timeid.go | 0 {util => internal}/timeid/timeid_test.go | 0 {util => internal}/xor/xor.go | 0 server/server.go | 2 +- server/server.internal.go | 6 +++--- 11 files changed, 11 insertions(+), 11 deletions(-) rename {util => internal}/scha/hash.go (98%) rename {util => internal}/scha/hash_test.go (100%) rename {util => internal}/timeid/timeid.go (100%) rename {util => internal}/timeid/timeid_test.go (100%) rename {util => internal}/xor/xor.go (100%) diff --git a/client/client.go b/client/client.go index 4a20c8b..e554cf8 100644 --- a/client/client.go +++ b/client/client.go @@ -5,7 +5,7 @@ import ( "fmt" "git.xdrm.io/schastsp/internal/keyset" "git.xdrm.io/schastsp/context" - "git.xdrm.io/schastsp/util/scha" + "git.xdrm.io/schastsp/internal/scha" "io" ) diff --git a/client/client.internal.go b/client/client.internal.go index 4fe67c2..12c4ccc 100644 --- a/client/client.internal.go +++ b/client/client.internal.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "fmt" "git.xdrm.io/schastsp/internal/keyset" - "git.xdrm.io/schastsp/util/scha" - "git.xdrm.io/schastsp/util/timeid" - "git.xdrm.io/schastsp/util/xor" + "git.xdrm.io/schastsp/internal/scha" + "git.xdrm.io/schastsp/internal/timeid" + "git.xdrm.io/schastsp/internal/xor" ) /* (1) Updates 'key' and 'sync' with files diff --git a/cmd/server/server.go b/cmd/server/server.go index 567f673..4ff2357 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -1,7 +1,7 @@ package main import ( - "git.xdrm.io/schastsp/util/scha" + "git.xdrm.io/schastsp/internal/scha" "time" "os" "flag" diff --git a/internal/keyset/keyset.go b/internal/keyset/keyset.go index 2d87007..b259e1a 100644 --- a/internal/keyset/keyset.go +++ b/internal/keyset/keyset.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "errors" "git.xdrm.io/schastsp/context" - "git.xdrm.io/schastsp/util/scha" + "git.xdrm.io/schastsp/internal/scha" "io" ) diff --git a/util/scha/hash.go b/internal/scha/hash.go similarity index 98% rename from util/scha/hash.go rename to internal/scha/hash.go index 70d621a..bcfaed3 100644 --- a/util/scha/hash.go +++ b/internal/scha/hash.go @@ -3,7 +3,7 @@ package scha import ( "errors" "crypto/sha512" - "git.xdrm.io/schastsp/util/xor" + "git.xdrm.io/schastsp/internal/xor" ) /* (0) Static diff --git a/util/scha/hash_test.go b/internal/scha/hash_test.go similarity index 100% rename from util/scha/hash_test.go rename to internal/scha/hash_test.go diff --git a/util/timeid/timeid.go b/internal/timeid/timeid.go similarity index 100% rename from util/timeid/timeid.go rename to internal/timeid/timeid.go diff --git a/util/timeid/timeid_test.go b/internal/timeid/timeid_test.go similarity index 100% rename from util/timeid/timeid_test.go rename to internal/timeid/timeid_test.go diff --git a/util/xor/xor.go b/internal/xor/xor.go similarity index 100% rename from util/xor/xor.go rename to internal/xor/xor.go diff --git a/server/server.go b/server/server.go index 495bd76..911f027 100644 --- a/server/server.go +++ b/server/server.go @@ -2,7 +2,7 @@ package server import ( "fmt" - "git.xdrm.io/schastsp/util/scha" + "git.xdrm.io/schastsp/internal/scha" "io" "os" "path/filepath" diff --git a/server/server.internal.go b/server/server.internal.go index aa0be2f..5a5bb8f 100644 --- a/server/server.internal.go +++ b/server/server.internal.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "errors" "fmt" - "git.xdrm.io/schastsp/util/scha" - "git.xdrm.io/schastsp/util/timeid" - "git.xdrm.io/schastsp/util/xor" + "git.xdrm.io/schastsp/internal/scha" + "git.xdrm.io/schastsp/internal/timeid" + "git.xdrm.io/schastsp/internal/xor" "os" )