arnaucube
arnaucube/hermez-nodePublic Self-hosted repository
Merge pull request #659 from hermeznetwork/feature/move-api-subpackages

Move apitypes & stateapiupdater into api dir
a_bennassar arnaubennassar5@gmail.com
Mon, 22 Mar 2021 17:02:38 +0100
commit

21840844085fe4b5d438ea6aa44a771e73e0f38d

parent

c2c74e14f10db37d8c6546e3c0f98cd9e332f4cc

M api/account_test.go → api/account_test.go

@@ -5,7 +5,7 @@ "fmt"

"strconv" "testing" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/mitchellh/copystructure"
M api/accountcreationauths.go → api/accountcreationauths.go

@@ -7,7 +7,7 @@ "time"

ethCommon "github.com/ethereum/go-ethereum/common" "github.com/gin-gonic/gin" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/iden3/go-iden3-crypto/babyjub" )
M api/api_test.go → api/api_test.go

@@ -19,12 +19,12 @@

ethCommon "github.com/ethereum/go-ethereum/common" swagger "github.com/getkin/kin-openapi/openapi3filter" "github.com/gin-gonic/gin" + "github.com/hermeznetwork/hermez-node/api/stateapiupdater" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/hermeznetwork/hermez-node/db/l2db" "github.com/hermeznetwork/hermez-node/log" - "github.com/hermeznetwork/hermez-node/stateapiupdater" "github.com/hermeznetwork/hermez-node/test" "github.com/hermeznetwork/hermez-node/test/til" "github.com/hermeznetwork/hermez-node/test/txsets"
M api/batch_test.go → api/batch_test.go

@@ -7,7 +7,7 @@ "testing"

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/mitchellh/copystructure"
M api/exits_test.go → api/exits_test.go

@@ -4,7 +4,7 @@ import (

"fmt" "testing" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/mitchellh/copystructure"
M api/state_test.go → api/state_test.go

@@ -4,7 +4,7 @@ import (

"math/big" "testing" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/stretchr/testify/assert"
M api/txshistory_test.go → api/txshistory_test.go

@@ -8,7 +8,7 @@ "sort"

"testing" "time" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/hermeznetwork/hermez-node/test"
M api/txspool.go → api/txspool.go

@@ -8,7 +8,7 @@ "net/http"

ethCommon "github.com/ethereum/go-ethereum/common" "github.com/gin-gonic/gin" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/l2db" "github.com/hermeznetwork/tracerr"
M db/historydb/apiqueries.go → db/historydb/apiqueries.go

@@ -8,7 +8,7 @@ "math/big"

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db" "github.com/hermeznetwork/tracerr"
M db/historydb/historydb_test.go → db/historydb/historydb_test.go

@@ -11,7 +11,7 @@ "testing"

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" dbUtils "github.com/hermeznetwork/hermez-node/db" "github.com/hermeznetwork/hermez-node/log"
M db/historydb/nodeinfo.go → db/historydb/nodeinfo.go

@@ -4,7 +4,7 @@ import (

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/tracerr" "github.com/russross/meddler"
M db/historydb/views.go → db/historydb/views.go

@@ -6,7 +6,7 @@ "math/big"

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/iden3/go-iden3-crypto/babyjub" "github.com/iden3/go-merkletree"
M db/l2db/views.go → db/l2db/views.go

@@ -6,7 +6,7 @@ "math/big"

"time" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/hermeznetwork/hermez-node/apitypes" + "github.com/hermeznetwork/hermez-node/api/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/iden3/go-iden3-crypto/babyjub" )
M node/node.go → node/node.go

@@ -15,6 +15,7 @@ "github.com/ethereum/go-ethereum/ethclient"

"github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "github.com/hermeznetwork/hermez-node/api" + "github.com/hermeznetwork/hermez-node/api/stateapiupdater" "github.com/hermeznetwork/hermez-node/batchbuilder" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/config"

@@ -27,7 +28,6 @@ "github.com/hermeznetwork/hermez-node/eth"

"github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/hermez-node/priceupdater" "github.com/hermeznetwork/hermez-node/prover" - "github.com/hermeznetwork/hermez-node/stateapiupdater" "github.com/hermeznetwork/hermez-node/synchronizer" "github.com/hermeznetwork/hermez-node/test/debugapi" "github.com/hermeznetwork/hermez-node/txprocessor"