Add support for custom action #483
Conversation
state/src/item/cache.rs
Outdated
| impl CacheableItem for Bytes { | ||
| type Address = H256; | ||
| fn is_null(&self) -> bool { | ||
| self.len() == 0 |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
codechain/config/chain_type.rs
Outdated
| @@ -66,17 +68,17 @@ impl fmt::Display for ChainType { | |||
| } | |||
|
|
|||
| impl ChainType { | |||
| pub fn spec<'a>(&self) -> Result<Spec, String> { | |||
| pub fn spec<'a>(&self, handlers: &[Arc<ActionHandler>]) -> Result<Spec, String> { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
core/src/spec/spec.rs
Outdated
| @@ -350,7 +373,7 @@ impl Spec { | |||
| } | |||
|
|
|||
| /// Load from JSON object. | |||
| fn load_from(s: cjson::spec::Spec) -> Result<Spec, Error> { | |||
| fn load_from(s: cjson::spec::Spec, handlers: &[Arc<ActionHandler>]) -> Result<Spec, Error> { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| Ok(()) | ||
| } | ||
|
|
||
| fn is_target(&self, bytes: &Bytes) -> bool { |
There was a problem hiding this comment.
How about remove this method
There was a problem hiding this comment.
We need some sort of function that only checks if provided byte array is valid one that this handler can decode, without execution. It's used for blocking invalid parcels in sync and rpc.
Since execute requires TopLevelState as argument, I think it's not a good idea to merge these.
state/src/action_handler/hit.rs
Outdated
| } | ||
|
|
||
| /// `bytes` must be valid encoding of HitAction | ||
| fn execute(&self, bytes: &Bytes, state: &mut TopLevelState) -> StateResult<Outcome> { |
There was a problem hiding this comment.
and make this function return Option<StateResult<Outcome>>?
| @@ -410,6 +410,15 @@ impl TopLevelState { | |||
| error: None, | |||
| }) | |||
| } | |||
| Action::Custom(bytes) => { | |||
| let handlers = self.db.custom_handlers().to_vec(); | |||
There was a problem hiding this comment.
Why do you convert it do Vec?
There was a problem hiding this comment.
custom_handlers returns reference, so handlers borrows self.
self is used as mutable reference in later code, so lifetime conflicts there.
So I wanted to clone handlers, and I thought to_vec would be a good solution.
| @@ -449,6 +452,10 @@ impl BlockChainClient for Client { | |||
| }) | |||
| }) | |||
| } | |||
|
|
|||
| fn custom_handlers(&self) -> Vec<Arc<ActionHandler>> { | |||
There was a problem hiding this comment.
Why noy fn custom_handlers(&self) -> &[Arc<ActionHandler>>] {
There was a problem hiding this comment.
If we return reference, then lock over state_db won't be released while holding that reference.
I thought it would be simpler to return a fresh copy of the vector and release the lock earlier instead of holding the lock.
remagpie
force-pushed
the
custom-action
branch
2 times, most recently
from
952e821 to
33008a3
Compare
No description provided.