Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
ab14fe99
Unverified
Commit
ab14fe99
authored
Jun 27, 2021
by
acud
Committed by
GitHub
Jun 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert: default stamp issuer (#2219)
parent
cce8ab8b
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
26 additions
and
110 deletions
+26
-110
api.go
pkg/api/api.go
+8
-9
api_test.go
pkg/api/api_test.go
+1
-1
bytes.go
pkg/api/bytes.go
+1
-4
bzz.go
pkg/api/bzz.go
+1
-4
chunk.go
pkg/api/chunk.go
+1
-4
feed.go
pkg/api/feed.go
+1
-4
feed_test.go
pkg/api/feed_test.go
+2
-2
pss.go
pkg/api/pss.go
+1
-4
pss_test.go
pkg/api/pss_test.go
+2
-2
soc.go
pkg/api/soc.go
+1
-4
soc_test.go
pkg/api/soc_test.go
+2
-2
postage.go
pkg/debugapi/postage.go
+0
-27
router.go
pkg/debugapi/router.go
+0
-6
service.go
pkg/postage/mock/service.go
+0
-11
service.go
pkg/postage/service.go
+5
-26
No files found.
pkg/api/api.go
View file @
ab14fe99
...
...
@@ -69,14 +69,13 @@ const (
)
var
(
errInvalidNameOrAddress
=
errors
.
New
(
"invalid name or bzz address"
)
errNoResolver
=
errors
.
New
(
"no resolver connected"
)
errInvalidRequest
=
errors
.
New
(
"could not validate request"
)
errInvalidContentType
=
errors
.
New
(
"invalid content-type"
)
errDirectoryStore
=
errors
.
New
(
"could not store directory"
)
errFileStore
=
errors
.
New
(
"could not store file"
)
errInvalidPostageBatch
=
errors
.
New
(
"invalid postage batch id"
)
errSwarmPostageBatchIDHeaderNotFound
=
fmt
.
Errorf
(
"header %s not found"
,
SwarmPostageBatchIdHeader
)
errInvalidNameOrAddress
=
errors
.
New
(
"invalid name or bzz address"
)
errNoResolver
=
errors
.
New
(
"no resolver connected"
)
errInvalidRequest
=
errors
.
New
(
"could not validate request"
)
errInvalidContentType
=
errors
.
New
(
"invalid content-type"
)
errDirectoryStore
=
errors
.
New
(
"could not store directory"
)
errFileStore
=
errors
.
New
(
"could not store file"
)
errInvalidPostageBatch
=
errors
.
New
(
"invalid postage batch id"
)
)
// Service is the API service interface.
...
...
@@ -238,7 +237,7 @@ func requestPostageBatchId(r *http.Request) ([]byte, error) {
return
b
,
nil
}
return
nil
,
err
SwarmPostageBatchIDHeaderNotFound
return
nil
,
err
InvalidPostageBatch
}
func
(
s
*
server
)
newTracingHandler
(
spanName
string
)
func
(
h
http
.
Handler
)
http
.
Handler
{
...
...
pkg/api/api_test.go
View file @
ab14fe99
...
...
@@ -284,7 +284,7 @@ func TestPostageHeaderError(t *testing.T) {
for
_
,
endpoint
:=
range
endpoints
{
t
.
Run
(
endpoint
+
": empty batch"
,
func
(
t
*
testing
.
T
)
{
hexbatch
:=
hex
.
EncodeToString
(
batchEmpty
)
expCode
:=
http
.
Status
Created
expCode
:=
http
.
Status
BadRequest
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
"/"
+
endpoint
,
expCode
,
jsonhttptest
.
WithRequestHeader
(
api
.
SwarmPostageBatchIdHeader
,
hexbatch
),
jsonhttptest
.
WithRequestHeader
(
api
.
ContentTypeHeader
,
"application/octet-stream"
),
...
...
pkg/api/bytes.go
View file @
ab14fe99
...
...
@@ -52,10 +52,7 @@ func (s *server) bytesUploadHandler(w http.ResponseWriter, r *http.Request) {
ctx
:=
sctx
.
SetTag
(
r
.
Context
(),
tag
)
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
logger
.
Debugf
(
"bytes upload: postage batch id:%v"
,
err
)
logger
.
Error
(
"bytes upload: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
nil
)
...
...
pkg/api/bzz.go
View file @
ab14fe99
...
...
@@ -46,10 +46,7 @@ func (s *server) bzzUploadHandler(w http.ResponseWriter, r *http.Request) {
}
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
logger
.
Debugf
(
"bzz upload: postage batch id: %v"
,
err
)
logger
.
Error
(
"bzz upload: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
"invalid postage batch id"
)
...
...
pkg/api/chunk.go
View file @
ab14fe99
...
...
@@ -86,10 +86,7 @@ func (s *server) chunkUploadHandler(w http.ResponseWriter, r *http.Request) {
}
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
s
.
logger
.
Debugf
(
"chunk upload: postage batch id: %v"
,
err
)
s
.
logger
.
Error
(
"chunk upload: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
"invalid postage batch id"
)
...
...
pkg/api/feed.go
View file @
ab14fe99
...
...
@@ -142,10 +142,7 @@ func (s *server) feedPostHandler(w http.ResponseWriter, r *http.Request) {
}
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
s
.
logger
.
Debugf
(
"feed put: postage batch id: %v"
,
err
)
s
.
logger
.
Error
(
"feed put: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
"invalid postage batch id"
)
...
...
pkg/api/feed_test.go
View file @
ab14fe99
...
...
@@ -212,9 +212,9 @@ func TestFeed_Post(t *testing.T) {
jsonhttptest
.
WithRequestHeader
(
api
.
SwarmPostageBatchIdHeader
,
hexbatch
),
)
})
t
.
Run
(
"
ok
- batch empty"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
bad request
- batch empty"
,
func
(
t
*
testing
.
T
)
{
hexbatch
:=
hex
.
EncodeToString
(
batchEmpty
)
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
url
,
http
.
Status
Created
,
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
url
,
http
.
Status
BadRequest
,
jsonhttptest
.
WithRequestHeader
(
api
.
SwarmPostageBatchIdHeader
,
hexbatch
),
)
})
...
...
pkg/api/pss.go
View file @
ab14fe99
...
...
@@ -78,10 +78,7 @@ func (s *server) pssPostHandler(w http.ResponseWriter, r *http.Request) {
return
}
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
s
.
logger
.
Debugf
(
"pss: postage batch id: %v"
,
err
)
s
.
logger
.
Error
(
"pss: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
"invalid postage batch id"
)
...
...
pkg/api/pss_test.go
View file @
ab14fe99
...
...
@@ -235,9 +235,9 @@ func TestPssSend(t *testing.T) {
jsonhttptest
.
WithRequestBody
(
bytes
.
NewReader
(
payload
)),
)
})
t
.
Run
(
"
ok batch
- batch empty"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
bad request
- batch empty"
,
func
(
t
*
testing
.
T
)
{
hexbatch
:=
hex
.
EncodeToString
(
batchEmpty
)
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
"/pss/send/to/12"
,
http
.
Status
Created
,
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
"/pss/send/to/12"
,
http
.
Status
BadRequest
,
jsonhttptest
.
WithRequestHeader
(
api
.
SwarmPostageBatchIdHeader
,
hexbatch
),
jsonhttptest
.
WithRequestBody
(
bytes
.
NewReader
(
payload
)),
)
...
...
pkg/api/soc.go
View file @
ab14fe99
...
...
@@ -128,10 +128,7 @@ func (s *server) socUploadHandler(w http.ResponseWriter, r *http.Request) {
return
}
batch
,
err
:=
requestPostageBatchId
(
r
)
switch
{
case
errors
.
Is
(
err
,
errSwarmPostageBatchIDHeaderNotFound
)
&&
s
.
post
.
DefaultIssuer
()
!=
nil
:
batch
=
s
.
post
.
DefaultIssuer
()
.
ID
()
case
err
!=
nil
:
if
err
!=
nil
{
s
.
logger
.
Debugf
(
"soc upload: postage batch id: %v"
,
err
)
s
.
logger
.
Error
(
"soc upload: postage batch id"
)
jsonhttp
.
BadRequest
(
w
,
"invalid postage batch id"
)
...
...
pkg/api/soc_test.go
View file @
ab14fe99
...
...
@@ -161,10 +161,10 @@ func TestSOC(t *testing.T) {
jsonhttptest
.
WithRequestBody
(
bytes
.
NewReader
(
s
.
WrappedChunk
.
Data
())),
)
})
t
.
Run
(
"
ok
- batch empty"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
err
- batch empty"
,
func
(
t
*
testing
.
T
)
{
s
:=
testingsoc
.
GenerateMockSOC
(
t
,
testData
)
hexbatch
:=
hex
.
EncodeToString
(
batchEmpty
)
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
socResource
(
hex
.
EncodeToString
(
s
.
Owner
),
hex
.
EncodeToString
(
s
.
ID
),
hex
.
EncodeToString
(
s
.
Signature
)),
http
.
Status
Created
,
jsonhttptest
.
Request
(
t
,
client
,
http
.
MethodPost
,
socResource
(
hex
.
EncodeToString
(
s
.
Owner
),
hex
.
EncodeToString
(
s
.
ID
),
hex
.
EncodeToString
(
s
.
Signature
)),
http
.
Status
BadRequest
,
jsonhttptest
.
WithRequestHeader
(
api
.
SwarmPostageBatchIdHeader
,
hexbatch
),
jsonhttptest
.
WithRequestBody
(
bytes
.
NewReader
(
s
.
WrappedChunk
.
Data
())),
)
...
...
pkg/debugapi/postage.go
View file @
ab14fe99
...
...
@@ -14,7 +14,6 @@ import (
"github.com/ethersphere/bee/pkg/bigint"
"github.com/ethersphere/bee/pkg/jsonhttp"
"github.com/ethersphere/bee/pkg/postage"
"github.com/ethersphere/bee/pkg/postage/postagecontract"
"github.com/ethersphere/bee/pkg/sctx"
"github.com/gorilla/mux"
...
...
@@ -162,32 +161,6 @@ func (s *Service) postageGetStampHandler(w http.ResponseWriter, r *http.Request)
jsonhttp
.
OK
(
w
,
&
resp
)
}
// postageSetDefaultStampIssuerHandler sets the default postage stamps issuer.
func
(
s
*
Service
)
postageSetDefaultStampIssuerHandler
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
idStr
:=
mux
.
Vars
(
r
)[
"id"
]
if
idStr
==
""
||
len
(
idStr
)
!=
64
{
s
.
logger
.
Error
(
"get stamp issuer: invalid batchID"
)
jsonhttp
.
BadRequest
(
w
,
"invalid batchID"
)
return
}
id
,
err
:=
hex
.
DecodeString
(
idStr
)
if
err
!=
nil
{
s
.
logger
.
Error
(
"set stamp issuer: invalid batchID: %v"
,
err
)
s
.
logger
.
Error
(
"set stamp issuer: invalid batchID"
)
jsonhttp
.
BadRequest
(
w
,
"invalid batchID"
)
return
}
switch
err
:=
s
.
post
.
SetDefaultIssuer
(
id
);
{
case
errors
.
Is
(
err
,
postage
.
ErrNotFound
)
:
jsonhttp
.
NotFound
(
w
,
nil
)
case
err
!=
nil
:
s
.
logger
.
Debugf
(
"debug api: set default stamp issuer: %v"
,
err
)
jsonhttp
.
InternalServerError
(
w
,
err
)
}
}
type
reserveStateResponse
struct
{
Radius
uint8
`json:"radius"`
StorageRadius
uint8
`json:"storageRadius"`
...
...
pkg/debugapi/router.go
View file @
ab14fe99
...
...
@@ -204,12 +204,6 @@ func (s *Service) newRouter() *mux.Router {
})),
)
router
.
Handle
(
"/stamps/default/{id}"
,
web
.
ChainHandlers
(
web
.
FinalHandler
(
jsonhttp
.
MethodHandler
{
"PUT"
:
http
.
HandlerFunc
(
s
.
postageSetDefaultStampIssuerHandler
),
})),
)
return
router
}
...
...
pkg/postage/mock/service.go
View file @
ab14fe99
...
...
@@ -65,17 +65,6 @@ func (m *mockPostage) GetStampIssuer(id []byte) (*postage.StampIssuer, error) {
return
nil
,
errors
.
New
(
"stampissuer not found"
)
}
// SetDefaultIssuer sets the default stamps issuer.
func
(
m
*
mockPostage
)
SetDefaultIssuer
([]
byte
)
error
{
// Noop, the default is m.i.
return
nil
}
// DefaultIssuer returns the default stamps issuer.
func
(
m
*
mockPostage
)
DefaultIssuer
()
*
postage
.
StampIssuer
{
return
m
.
i
}
func
(
m
*
mockPostage
)
IssuerUsable
(
_
*
postage
.
StampIssuer
)
bool
{
return
true
}
...
...
pkg/postage/service.go
View file @
ab14fe99
...
...
@@ -34,8 +34,6 @@ type Service interface {
StampIssuers
()
[]
*
StampIssuer
GetStampIssuer
([]
byte
)
(
*
StampIssuer
,
error
)
IssuerUsable
(
*
StampIssuer
)
bool
SetDefaultIssuer
([]
byte
)
error
DefaultIssuer
()
*
StampIssuer
BatchCreationListener
io
.
Closer
}
...
...
@@ -43,12 +41,11 @@ type Service interface {
// service handles postage batches
// stores the active batches.
type
service
struct
{
lock
sync
.
Mutex
store
storage
.
StateStorer
postageStore
Storer
chainID
int64
issuers
[]
*
StampIssuer
defaultStampIssuer
*
StampIssuer
lock
sync
.
Mutex
store
storage
.
StateStorer
postageStore
Storer
chainID
int64
issuers
[]
*
StampIssuer
}
// NewService constructs a new Service.
...
...
@@ -90,24 +87,6 @@ func (ps *service) Add(st *StampIssuer) {
ps
.
issuers
=
append
(
ps
.
issuers
,
st
)
}
// SetDefaultIssuer sets the default stamps issuer.
func
(
ps
*
service
)
SetDefaultIssuer
(
id
[]
byte
)
error
{
si
,
err
:=
ps
.
GetStampIssuer
(
id
)
if
err
!=
nil
{
return
err
}
ps
.
lock
.
Lock
()
ps
.
defaultStampIssuer
=
si
ps
.
lock
.
Unlock
()
return
nil
}
// DefaultIssuer returns the default stamps issuer.
func
(
ps
*
service
)
DefaultIssuer
()
*
StampIssuer
{
return
ps
.
defaultStampIssuer
}
// Handle implements the BatchCreationListener interface. This is fired on receiving
// a batch creation event from the blockchain listener to ensure that if a stamp
// issuer was not created initially, we will create it here.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment