mirror of
https://github.com/GMWalletApp/epusdt.git
synced 2026-07-07 18:26:16 +00:00
feat(order): use crypto-random url-safe trade IDs and update docs examples
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
cryptorand "crypto/rand"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/GMWalletApp/epusdt/config"
|
||||
"github.com/GMWalletApp/epusdt/model/dao"
|
||||
@@ -322,9 +322,11 @@ func ReserveAvailableWalletAndAmount(tradeID string, network string, token strin
|
||||
|
||||
// GenerateCode creates a unique trade id.
|
||||
func GenerateCode() string {
|
||||
date := time.Now().Format("20060102")
|
||||
r := rand.Intn(1000)
|
||||
return fmt.Sprintf("%s%d%03d", date, time.Now().UnixNano()/1e6, r)
|
||||
buf := make([]byte, 18)
|
||||
if _, err := cryptorand.Read(buf); err != nil {
|
||||
panic(fmt.Sprintf("generate trade id: crypto/rand failed: %v", err))
|
||||
}
|
||||
return base64.RawURLEncoding.EncodeToString(buf)
|
||||
}
|
||||
|
||||
// GetOrderInfoByTradeId returns a validated order.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
@@ -36,6 +37,31 @@ func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
return f(req)
|
||||
}
|
||||
|
||||
func TestGenerateCodeFormat(t *testing.T) {
|
||||
tradeID := GenerateCode()
|
||||
|
||||
if len(tradeID) != 24 {
|
||||
t.Fatalf("trade id length = %d, want 24", len(tradeID))
|
||||
}
|
||||
if strings.Contains(tradeID, "=") {
|
||||
t.Fatalf("trade id = %q, contains padding '='", tradeID)
|
||||
}
|
||||
for _, ch := range tradeID {
|
||||
if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '_' {
|
||||
continue
|
||||
}
|
||||
t.Fatalf("trade id = %q, contains non URL-safe character %q", tradeID, ch)
|
||||
}
|
||||
|
||||
decoded, err := base64.RawURLEncoding.DecodeString(tradeID)
|
||||
if err != nil {
|
||||
t.Fatalf("decode trade id %q: %v", tradeID, err)
|
||||
}
|
||||
if len(decoded) != 18 {
|
||||
t.Fatalf("decoded trade id length = %d, want 18", len(decoded))
|
||||
}
|
||||
}
|
||||
|
||||
func installMockHTTPClient(t *testing.T, handler roundTripFunc) {
|
||||
t.Helper()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user