mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-05-14 07:26:47 +00:00
Engine: Scripting support (#383)
* WIP * updated appveyor and increased deadline 5 seconds due to increased linters being added * revert files to upstream/engine * WIP * WIP * mod file changes * added script manager * Added manager/and cli interfaces to scripting * Added script task handler * WIP - Added timer/repeat support and fleshed out wrapper further * autoload support added + WIP * WIP commit * added account balance info * btc markets temp work around * WIP - merged with upstream for new order package BTC Markets responses broken * Cancel order wrapper WIP * order wrapper update * Added test coverage for VM * moved to map for VM List shutdown of all VM now handled added gctcli commands for list and stop of running scripts * added override to load/execute for path * fixed incorrect channel shutdown added further test coverage and restructured gctcli commands into sub commands * increased test coverage for packages * Added docs cleaned up tests and example scripts * Test coverage increased for module/gct/exchange package * windows fixes * merged upstream/engine * WIP * logger fixes - removed pointer to bool check removed duplicate test check for logger * remove unused mutex * added inital upload support * fix linter issues for go-fmt * added zip support for uploading and added base for fund withdrawing * changed error return types and also log errors, fix zip path issue * improved error outputs and code flow * pairs response fix added protobuf defs for stop all and list all * added stop all running scripts general clean up and moved across to OrderManager * linter fixes (gofmt) * added list all command * rewrote zip handler to be cleaner also fixed file overwrite on upload * added query command reworked tests * added further error checking to compileandrun corrected use of pointers for accountinfo * bumped tengo version * Removed named returns reworded log messages removed unused falseptr * WIP * Added virutal machine limit improved config options * added model for script event added upload validation * script_event table has been completed, tests for wrapper functions implemented * README updates * reverted changes opened new PR to move withdraw struct outs * intial work on adding withdraw support after merger of withdraw package * started work on examples * Added crypto withdraw support * fix switch case assignment and gofmt project * Reworking Fiat withdraw request pending #402 * removed double pointer call * added withdraw support for fiat currencies * added tests for withdraw methods increased readme * removed local tengo require and also fix linter issues * Added default log size const added basic test for invalid script execution * First pass at moving wrapper to validator package to allow proper validation of uploaded scripts * Added script details to README added config test added test for no file extension * moved tests to const and fixed incorrect pathing * added test coverage to withdraw package * corrected file close handling * point to included configtest.json * extended validator support when a script is uploaded * Bug fix on bool logic * Added mutex * Don't create autit events on test execution * reverted common to master * moved file rename to unix timestamp format * converted logger enabled back to pointer as i need nilness check also moved scriptid to text over blob * started work on autoload add/remove support * First round of PR fixes (mostly commented exports) * Moved GCTScript load to last, removed unneeded error from cleanup() * Comment clairty for AuitEventID * added autoload add/remove command to cli * added tests for autoload * Test updates for Exchanges * linter fixes (gofmt) * Removed double check of engine pointer * remove possible nil pointer on GetSpecificTicker * Fixed not closing file handler on write that causes archive removal to fail * file handler Close clean ups * corrected spelling on error return and return invalid name n autoload * moved strings to cosnt moved bool pointer creation to convert package * new zip extractor added * Validation has been added to archive uploads * removed shadow var on err * added ok check to conversion * converted condition check * basic test for zip extract added * new zip handler * reverted back to old atomic loading system * removed shadow err * lets add a new line * added space to error return * command line toggle for script now works properly * readme updated * set configLoaded to true * check for configLoaded condition * added mutex to allow for multiple access on virtual machine increased test coverage disable script manager if scripting is disabled * linked up to enable/disablesubsystem commands * added start/stop example to readme * reworked logic on test as check should be done on Load() * updated to tengo v2 * linters * lower time on ntp client to stop slippage * remove all fails if any fail validtion from an archive * remove vm from list if timer is invalid * removed shadow on err * remove config creation from NTPCheck test * WIP testing DB changes * add unique constraint * WIP: created has many model * linters run * basic sqlite3 support added for new database format * linters run * Added test coverage for script repo * removed unused print * updated env vars for CI instances * updated env vars for CI instances * Updated test packages * Test updates for postgresql * removed invalid tests from postgres * remove duplication of struct and improved code flow * general cleanup * wording changes on log output * use databasemgr logger and add support for autoload without file extension * corrected test naming * return correct error * return correct error again version 82 * store scriptdata on creation * Hello * Errorln -> Errorf * Removed unused vars * Read me updates * testing without parallel * comment on exported type * added nil check against VM for test * add debugging information * gofmt * remove verbose and data sent to channel * Added debug information * linter fixes (gofmt) * remove unused CompileAndRun() call * test sleep to see if issue is timing related * semi-concurrent map fixes * one day i will run gofmt or setup precommit hooks * new line :D * increased test coverage * added correct sleep time * Moved over to sync map * linter fixes (gofmt) * goimports * moved VM related methods to vm.go * new line at end of file * trying increased timeout on golangci-lint for appveyor * add debugging information * removed timeout * reworked timeout logic * linter fixes (gofmt) * increased test coverage * increased test coverage * one day i will run gofmt or setup precommit hooks * removed unused exchange test * increased golangci-lint timeout * Added nil check on shutdown and test coverage for it lowered timeout back to 1:30 * reworked ID system * removed script hash as it was unused * added comments on exported methods and read me update * reorder code * removed to atomic.value for test execution flag * increased test coverage * move add further up execution * point to correct script file
This commit is contained in:
Andrew
Adrian Gallagher
74
exchanges/withdraw/withdraw.go
Normal file
74
exchanges/withdraw/withdraw.go
Normal file
@@ -0,0 +1,74 @@
|
||||
package withdraw
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"github.com/thrasher-corp/gocryptotrader/currency"
|
||||
)
|
||||
|
||||
// Valid takes interface and passes to asset type to check the request meets requirements to submit
|
||||
func Valid(request interface{}) error {
|
||||
switch request := request.(type) {
|
||||
case *FiatRequest:
|
||||
return ValidateFiat(request)
|
||||
case *CryptoRequest:
|
||||
return ValidateCrypto(request)
|
||||
default:
|
||||
return ErrInvalidRequest
|
||||
}
|
||||
}
|
||||
|
||||
// ValidateFiat checks if Fiat request is valid
|
||||
func ValidateFiat(request *FiatRequest) (err error) {
|
||||
if request == nil {
|
||||
return ErrRequestCannotBeNil
|
||||
}
|
||||
|
||||
var allErrors []string
|
||||
if (request.Currency != currency.Code{}) {
|
||||
if !request.Currency.IsFiatCurrency() {
|
||||
allErrors = append(allErrors, "currency is not a fiat currency")
|
||||
}
|
||||
} else {
|
||||
allErrors = append(allErrors, ErrStrNoCurrencySet)
|
||||
}
|
||||
|
||||
if request.Amount <= 0 {
|
||||
allErrors = append(allErrors, ErrStrAmountMustBeGreaterThanZero)
|
||||
}
|
||||
|
||||
if len(allErrors) > 0 {
|
||||
err = errors.New(strings.Join(allErrors, ", "))
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// ValidateCrypto checks if Crypto request is valid
|
||||
func ValidateCrypto(request *CryptoRequest) (err error) {
|
||||
if request == nil {
|
||||
return ErrRequestCannotBeNil
|
||||
}
|
||||
|
||||
var allErrors []string
|
||||
if (request.Currency != currency.Code{}) {
|
||||
if !request.Currency.IsCryptocurrency() {
|
||||
allErrors = append(allErrors, "currency is not a crypto currency")
|
||||
}
|
||||
} else {
|
||||
allErrors = append(allErrors, ErrStrNoCurrencySet)
|
||||
}
|
||||
|
||||
if request.Amount <= 0 {
|
||||
allErrors = append(allErrors, ErrStrAmountMustBeGreaterThanZero)
|
||||
}
|
||||
|
||||
if request.Address == "" {
|
||||
allErrors = append(allErrors, ErrStrAddressNotSet)
|
||||
}
|
||||
|
||||
if len(allErrors) > 0 {
|
||||
err = errors.New(strings.Join(allErrors, ", "))
|
||||
}
|
||||
return err
|
||||
}
|
||||
178
exchanges/withdraw/withdraw_test.go
Normal file
178
exchanges/withdraw/withdraw_test.go
Normal file
@@ -0,0 +1,178 @@
|
||||
package withdraw
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/thrasher-corp/gocryptotrader/currency"
|
||||
)
|
||||
|
||||
var (
|
||||
validFiatRequest = &FiatRequest{
|
||||
GenericInfo: GenericInfo{
|
||||
Currency: currency.AUD,
|
||||
Description: "Test Withdrawal",
|
||||
Amount: 0.1,
|
||||
},
|
||||
BankAccountName: "test-bank-account",
|
||||
BankAccountNumber: "test-bank-number",
|
||||
BankName: "test-bank-name",
|
||||
BSB: "",
|
||||
SwiftCode: "",
|
||||
IBAN: "",
|
||||
}
|
||||
|
||||
invalidFiatRequest = &FiatRequest{}
|
||||
invalidCurrencyFiatRequest = &FiatRequest{
|
||||
GenericInfo: GenericInfo{
|
||||
Currency: currency.BTC,
|
||||
Amount: 1,
|
||||
},
|
||||
}
|
||||
|
||||
validCryptoRequest = &CryptoRequest{
|
||||
GenericInfo: GenericInfo{
|
||||
Currency: currency.BTC,
|
||||
Description: "Test Withdrawal",
|
||||
Amount: 0.1,
|
||||
},
|
||||
Address: "1F5zVDgNjorJ51oGebSvNCrSAHpwGkUdDB",
|
||||
}
|
||||
invalidCryptoRequest = &CryptoRequest{}
|
||||
invalidCurrencyCryptoRequest = &CryptoRequest{
|
||||
GenericInfo: GenericInfo{
|
||||
Currency: currency.AUD,
|
||||
Amount: 0,
|
||||
},
|
||||
}
|
||||
invalidCryptoAddressRequest = &CryptoRequest{
|
||||
GenericInfo: GenericInfo{
|
||||
Currency: currency.BTC,
|
||||
Description: "Test Withdrawal",
|
||||
Amount: 0.1,
|
||||
},
|
||||
Address: "1D10TH0RS3",
|
||||
}
|
||||
)
|
||||
|
||||
func TestValid(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
request interface{}
|
||||
output interface{}
|
||||
}{
|
||||
{
|
||||
"Fiat",
|
||||
validFiatRequest,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"Crypto",
|
||||
validCryptoRequest,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"Invalid",
|
||||
nil,
|
||||
ErrInvalidRequest,
|
||||
},
|
||||
}
|
||||
for _, tests := range testCases {
|
||||
test := tests
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
err := Valid(test.request)
|
||||
if err != nil {
|
||||
if test.output.(error).Error() != err.Error() {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateFiat(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
request *FiatRequest
|
||||
output interface{}
|
||||
}{
|
||||
{
|
||||
"Valid",
|
||||
validFiatRequest,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"Invalid",
|
||||
invalidFiatRequest,
|
||||
errors.New("currency not set, amount must be greater than 0"),
|
||||
},
|
||||
{
|
||||
"NoRequest",
|
||||
nil,
|
||||
ErrRequestCannotBeNil,
|
||||
},
|
||||
{
|
||||
"CryptoCurrency",
|
||||
invalidCurrencyFiatRequest,
|
||||
errors.New("currency is not a fiat currency"),
|
||||
},
|
||||
}
|
||||
|
||||
for _, tests := range testCases {
|
||||
test := tests
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
err := ValidateFiat(test.request)
|
||||
if err != nil {
|
||||
if test.output.(error).Error() != err.Error() {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateCrypto(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
request *CryptoRequest
|
||||
output interface{}
|
||||
}{
|
||||
{
|
||||
"Valid",
|
||||
validCryptoRequest,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"Invalid",
|
||||
invalidCryptoRequest,
|
||||
errors.New("currency not set, amount must be greater than 0, address cannot be empty"),
|
||||
},
|
||||
{
|
||||
"NoRequest",
|
||||
nil,
|
||||
ErrRequestCannotBeNil,
|
||||
},
|
||||
{
|
||||
"FiatCurrency",
|
||||
invalidCurrencyCryptoRequest,
|
||||
errors.New("currency is not a crypto currency, amount must be greater than 0, address cannot be empty"),
|
||||
},
|
||||
{
|
||||
"InvalidAddress",
|
||||
invalidCryptoAddressRequest,
|
||||
errors.New(ErrStrAddressisInvalid),
|
||||
},
|
||||
}
|
||||
|
||||
for _, tests := range testCases {
|
||||
test := tests
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
err := ValidateCrypto(test.request)
|
||||
if err != nil {
|
||||
if test.output.(error).Error() != err.Error() {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,26 @@
|
||||
package withdraw
|
||||
|
||||
import "github.com/thrasher-corp/gocryptotrader/currency"
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/thrasher-corp/gocryptotrader/currency"
|
||||
)
|
||||
|
||||
const (
|
||||
// ErrStrAmountMustBeGreaterThanZero message to return when withdraw amount is less than 0
|
||||
ErrStrAmountMustBeGreaterThanZero = "amount must be greater than 0"
|
||||
// ErrStrAddressisInvalid message to return when address is invalid for crypto request
|
||||
ErrStrAddressisInvalid = "address is not valid"
|
||||
// ErrStrAddressNotSet message to returh when address is empty
|
||||
ErrStrAddressNotSet = "address cannot be empty"
|
||||
// ErrStrNoCurrencySet message to return when no currency is set
|
||||
ErrStrNoCurrencySet = "currency not set"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrRequestCannotBeNil = errors.New("request cannot be nil")
|
||||
ErrInvalidRequest = errors.New("invalid request type")
|
||||
)
|
||||
|
||||
// GenericInfo stores genric withdraw request info
|
||||
type GenericInfo struct {
|
||||
|
||||
Reference in New Issue
Block a user