From 9217b028a54d0e57a04be7680f83e147eacd9692 Mon Sep 17 00:00:00 2001 From: k-matsuzawa Date: Sun, 26 Feb 2023 14:27:59 +0900 Subject: [PATCH 1/2] feat: add library --- README.md | 6 ++ cmd/generateblock/argument.go | 27 --------- cmd/generateblock/main.go | 15 ++++- generateblock.go | 50 ++++++++++++++++ go.mod | 17 ++++-- go.sum | 81 ++++++-------------------- internal/domain/model/configuration.go | 2 +- internal/handler/handler.go | 24 +++++++- 8 files changed, 119 insertions(+), 103 deletions(-) create mode 100644 generateblock.go diff --git a/README.md b/README.md index 605796b..d503dbd 100644 --- a/README.md +++ b/README.md @@ -84,3 +84,9 @@ make build ```sh make gettools format ``` + +## use library + +```go +import gb "github.com/cryptogarageinc/generate-block-for-testing" +``` diff --git a/cmd/generateblock/argument.go b/cmd/generateblock/argument.go index 05a00c1..b9bac70 100644 --- a/cmd/generateblock/argument.go +++ b/cmd/generateblock/argument.go @@ -1,11 +1,5 @@ package main -import ( - "fmt" - - "github.com/cryptogarageinc/generate-block-for-testing/internal/domain/model" -) - type ArgError string const ( @@ -56,26 +50,5 @@ func (a *argument) Validate() error { if a.Host == "" { return ErrHostName } - if err := model.ValidateNetworkType(a.Network); err != nil { - return err - } return nil } - -func (a *argument) ToConfigurationModel() *model.Configuration { - var network model.NetworkType - if a.Network != "" { - network = model.NewNetworkType(a.Network) - } else { - network = model.ElementsRegtest - fmt.Println("set: default network elementsRegTest") - } - - config := &model.Configuration{ - Network: network, - FedpegScript: a.FedpegScript, - PakEntries: a.Pak, - Address: a.Address, - } - return config -} diff --git a/cmd/generateblock/main.go b/cmd/generateblock/main.go index ea3ec04..f07af41 100644 --- a/cmd/generateblock/main.go +++ b/cmd/generateblock/main.go @@ -5,6 +5,7 @@ import ( arg "github.com/alexflint/go-arg" env "github.com/caarlos0/env/v6" + "github.com/cryptogarageinc/generate-block-for-testing/internal/domain/model" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -55,13 +56,21 @@ func main() { logError("Error while validate argument", err) return } - config := argObj.ToConfigurationModel() - // dedpendency + var network string + if argObj.Network != "" { + network = argObj.Network + } else { + network = model.ElementsRegtest.String() + logger.Debug("set: default network elementsRegTest") + } + + // dependency handle := NewHandler(argObj) // execute - if err := handle.GenerateBlock(ctx, config); err != nil { + if err := handle.GenerateBlock( + ctx, network, argObj.FedpegScript, argObj.Pak, argObj.Address); err != nil { logError("GenerateBlock fail", err) } logger.Debug("end") diff --git a/generateblock.go b/generateblock.go new file mode 100644 index 0000000..059cd77 --- /dev/null +++ b/generateblock.go @@ -0,0 +1,50 @@ +package generateblock + +import ( + "context" + + "github.com/cryptogarageinc/generate-block-for-testing/internal/domain/service" + "github.com/cryptogarageinc/generate-block-for-testing/internal/handler" + "github.com/cryptogarageinc/generate-block-for-testing/internal/infrastructure/repository" + "github.com/cryptogarageinc/generate-block-for-testing/internal/usecase" +) + +type Connection struct { + Host string + RpcUserID string + RpcPassword string +} + +func GenerateBlock( + ctx context.Context, + nodeInfo *Connection, + network string, + address string, +) error { + handle := newHandler(nodeInfo.Host, nodeInfo.RpcUserID, nodeInfo.RpcPassword) + return handle.GenerateBlock(ctx, network, "", []string{}, address) +} + +func GenerateElementsDynafedBlock( + ctx context.Context, + nodeInfo *Connection, + network string, + fedpegScript string, + pakEntries []string, +) error { + handle := newHandler(nodeInfo.Host, nodeInfo.RpcUserID, nodeInfo.RpcPassword) + return handle.GenerateBlock(ctx, network, fedpegScript, pakEntries, "") +} + +func newHandler( + host, rpcUserID, rpcPassword string, +) handler.Handler { + blockchainConfig := repository.NewBlockchainRpcConfig( + host, rpcUserID, rpcPassword) + blockchainRepo := repository.NewBlockchainRpc(blockchainConfig) + + genBlockService := service.NewGenerateBlock(blockchainRepo) + genBlockUsecase := usecase.NewGenerateBlock(genBlockService) + + return handler.NewHandler(genBlockUsecase) +} diff --git a/go.mod b/go.mod index 56cb759..45bcca5 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,18 @@ module github.com/cryptogarageinc/generate-block-for-testing -go 1.16 +go 1.18 require ( - github.com/alexflint/go-arg v1.4.2 - github.com/caarlos0/env/v6 v6.7.2 - github.com/go-resty/resty/v2 v2.6.0 + github.com/alexflint/go-arg v1.4.3 + github.com/caarlos0/env/v6 v6.10.1 + github.com/go-resty/resty/v2 v2.7.0 github.com/pkg/errors v0.9.1 - go.uber.org/zap v1.19.1 + go.uber.org/zap v1.24.0 +) + +require ( + github.com/alexflint/go-scalar v1.1.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect ) diff --git a/go.sum b/go.sum index de99442..40c398f 100644 --- a/go.sum +++ b/go.sum @@ -1,85 +1,38 @@ -github.com/alexflint/go-arg v1.4.2 h1:lDWZAXxpAnZUq4qwb86p/3rIJJ2Li81EoMbTMujhVa0= -github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf2y2768kM= -github.com/alexflint/go-scalar v1.0.0 h1:NGupf1XV/Xb04wXskDFzS0KWOLH632W/EO4fAFi+A70= -github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw= +github.com/alexflint/go-arg v1.4.3 h1:9rwwEBpMXfKQKceuZfYcwuc/7YY7tWJbFsgG5cAU/uo= +github.com/alexflint/go-arg v1.4.3/go.mod h1:3PZ/wp/8HuqRZMUUgu7I+e1qcpUbvmS258mRXkFH4IA= +github.com/alexflint/go-scalar v1.1.0 h1:aaAouLLzI9TChcPXotr6gUhq+Scr8rl0P9P4PnltbhM= +github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/caarlos0/env/v6 v6.7.2 h1:Jiy2dBHvNgCfNGMP0hOZW6jHUbiENvP+VWDtLz4n1Kg= -github.com/caarlos0/env/v6 v6.7.2/go.mod h1:FE0jGiAnQqtv2TenJ4KTa8+/T2Ss8kdS5s1VEjasoN0= +github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II= +github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-resty/resty/v2 v2.6.0 h1:joIR5PNLM2EFqqESUjCMGXrWmXNHEU9CEiK813oKYS4= -github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= +github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.3.5 h1:dPmz1Snjq0kmkz159iL7S6WzdahUTHnHB5M56WFVifs= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/net v0.0.0-20211029224645-99673261e6eb h1:pirldcYWx7rx7kE5r+9WsOXPXK0+WH5+uZ7uPmJ44uM= +golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/domain/model/configuration.go b/internal/domain/model/configuration.go index 75f35c8..6b64002 100644 --- a/internal/domain/model/configuration.go +++ b/internal/domain/model/configuration.go @@ -45,7 +45,7 @@ func ValidateNetworkType(network string) error { case Mainnet.String(), Testnet.String(), Regtest.String(), LiquidV1.String(): case ElementsRegtest.String(), "liquidregtest": default: - return errors.New("no match network type") + return errors.Errorf("no match network type, %s", network) } return nil } diff --git a/internal/handler/handler.go b/internal/handler/handler.go index ec2789d..ba6a5b7 100644 --- a/internal/handler/handler.go +++ b/internal/handler/handler.go @@ -2,6 +2,7 @@ package handler import ( "context" + "errors" "github.com/cryptogarageinc/generate-block-for-testing/internal/domain/model" "github.com/cryptogarageinc/generate-block-for-testing/internal/usecase" @@ -10,7 +11,10 @@ import ( type Handler interface { GenerateBlock( ctx context.Context, - config *model.Configuration, + networkType string, + fedpegScript string, + pak []string, + address string, ) error } @@ -20,9 +24,23 @@ type handler struct { func (h *handler) GenerateBlock( ctx context.Context, - config *model.Configuration, + networkType string, + fedpegScript string, + pak []string, + address string, ) error { - return h.usecase.GenerateBlock(ctx, config) + if networkType == "" { + return errors.New("networkType is empty") + } + if err := model.ValidateNetworkType(networkType); err != nil { + return err + } + return h.usecase.GenerateBlock(ctx, &model.Configuration{ + Network: model.NewNetworkType(networkType), + FedpegScript: fedpegScript, + PakEntries: pak, + Address: address, + }) } func NewHandler(usecase usecase.GenerateBlock) Handler { From 5f723baabd8ccc60380c49d15ecb4b1d69860741 Mon Sep 17 00:00:00 2001 From: k-matsuzawa Date: Mon, 27 Feb 2023 09:58:50 +0900 Subject: [PATCH 2/2] feat: update CI and image --- .../workflows/create_release-and-upload.yml | 35 +++---------------- tests/testing_alpine3_16.dockerfile | 15 ++++++++ tests/testing_debian11.dockerfile | 2 +- 3 files changed, 20 insertions(+), 32 deletions(-) create mode 100644 tests/testing_alpine3_16.dockerfile diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml index 6e5f6b3..3ba51f1 100644 --- a/.github/workflows/create_release-and-upload.yml +++ b/.github/workflows/create_release-and-upload.yml @@ -1,40 +1,16 @@ name: create-release-upload -on: +on: push: tags: - 'v*' env: - GO_VERSION: 1.16.x + GO_VERSION: "^1.18.0" jobs: - create_releases: - name: create-releases - runs-on: ubuntu-20.04 - - steps: - - name: checkout - uses: actions/checkout@v3 - - name: Get the version - id: get_version - run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - - name: Create Release - id: create_release - uses: softprops/action-gh-release@v1 - with: - name: Release ${{ env.VERSION }} - body: | - Changes in this Release - - First Change - - Second Change - draft: false - prerelease: true - continue-on-error: true - - upload-object-ubuntu: - name: upload-object-ubuntu - needs: create_releases + upload-object: + name: upload-object runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -111,7 +87,6 @@ jobs: upload-object-alpine-3-14: name: upload-object-alpine-3.14 - needs: create_releases runs-on: ubuntu-20.04 env: FILENAME: "generateblock-alpine3_14" @@ -137,7 +112,6 @@ jobs: upload-object-alpine-3-15: name: upload-object-alpine-3.15 - needs: create_releases runs-on: ubuntu-20.04 env: FILENAME: "generateblock-alpine3_15" @@ -163,7 +137,6 @@ jobs: upload-object-alpine-3-16: name: upload-object-alpine-3.16 - needs: create_releases runs-on: ubuntu-20.04 env: FILENAME: "generateblock-alpine3_16" diff --git a/tests/testing_alpine3_16.dockerfile b/tests/testing_alpine3_16.dockerfile new file mode 100644 index 0000000..86421e7 --- /dev/null +++ b/tests/testing_alpine3_16.dockerfile @@ -0,0 +1,15 @@ +FROM alpine:3.16 + +RUN apk add --no-cache libstdc++ wget + +WORKDIR /opt/generateblock + +RUN wget https://github.com/cryptogarageinc/generate-block-for-testing/releases/download/v0.0.2/generateblock-alpine3_16.gz \ + && gunzip generateblock-alpine3_16.gz \ + && mv generateblock-alpine3_16 generateblock + +RUN chmod +x /opt/generateblock/generateblock + +ENV PATH $PATH:/opt/generateblock + +CMD ["generateblock", "-h"] diff --git a/tests/testing_debian11.dockerfile b/tests/testing_debian11.dockerfile index c104006..32999d0 100644 --- a/tests/testing_debian11.dockerfile +++ b/tests/testing_debian11.dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y wget WORKDIR /opt/generateblock -RUN wget https://github.com/cryptogarageinc/generate-block-for-testing/releases/download/v0.0.1-rc.3/generateblock-linux_amd64.gz \ +RUN wget --no-check-certificate https://github.com/cryptogarageinc/generate-block-for-testing/releases/download/v0.0.1-rc.3/generateblock-linux_amd64.gz \ && gunzip generateblock-linux_amd64.gz \ && mv generateblock-linux_amd64 generateblock