Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(wasmer): remove duplicate logged functions #2666

Merged
merged 1 commit into from
Jul 26, 2022
Merged

chore(wasmer): remove duplicate logged functions #2666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/runtime/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type Storage interface {
ClearPrefixInChild(keyToChild, prefix []byte) error
GetChildNextKey(keyToChild, key []byte) ([]byte, error)
GetChild(keyToChild []byte) (*trie.Trie, error)
ClearPrefix(prefix []byte) error
ClearPrefix(prefix []byte)
ClearPrefixLimit(prefix []byte, limit uint32) (uint32, bool)
BeginStorageTransaction()
CommitStorageTransaction()
Expand Down
3 changes: 1 addition & 2 deletions lib/runtime/storage/trie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,10 @@ func (s *TrieState) NextKey(key []byte) []byte {
}

// ClearPrefix deletes all key-value pairs from the trie where the key starts with the given prefix
func (s *TrieState) ClearPrefix(prefix []byte) error {
func (s *TrieState) ClearPrefix(prefix []byte) {
s.lock.Lock()
defer s.lock.Unlock()
s.t.ClearPrefix(prefix)
return nil
}

// ClearPrefixLimit deletes key-value pairs from the trie where the key starts with the given prefix till limit reached
Expand Down
45 changes: 21 additions & 24 deletions lib/runtime/wasmer/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ func ext_trie_blake2_256_root_version_1(context unsafe.Pointer, dataSpan C.int64
// this function is expecting an array of (key, value) tuples
var kvs []kv
if err := scale.Unmarshal(data, &kvs); err != nil {
logger.Errorf("[ext_trie_blake2_256_root_version_1]: %s", err)
logger.Errorf("failed scale decoding data: %s", err)
return 0
}

Expand All @@ -811,17 +811,17 @@ func ext_trie_blake2_256_root_version_1(context unsafe.Pointer, dataSpan C.int64
// allocate memory for value and copy value to memory
ptr, err := runtimeCtx.Allocator.Allocate(32)
if err != nil {
logger.Errorf("[ext_trie_blake2_256_root_version_1]: %s", err)
logger.Errorf("failed allocating: %s", err)
return 0
}

hash, err := t.Hash()
if err != nil {
logger.Errorf("[ext_trie_blake2_256_root_version_1]: %s", err)
logger.Errorf("failed computing trie Merkle root hash: %s", err)
EclesioMeloJunior marked this conversation as resolved.
Show resolved Hide resolved
return 0
}

logger.Debugf("[ext_trie_blake2_256_root_version_1]: root hash is %s", hash)
logger.Debugf("root hash is %s", hash)
copy(memory[ptr:ptr+32], hash[:])
return C.int32_t(ptr)
}
Expand All @@ -839,14 +839,14 @@ func ext_trie_blake2_256_ordered_root_version_1(context unsafe.Pointer, dataSpan
var values [][]byte
err := scale.Unmarshal(data, &values)
if err != nil {
logger.Errorf("[ext_trie_blake2_256_ordered_root_version_1]: %s", err)
logger.Errorf("failed scale decoding data: %s", err)
return 0
}

for i, val := range values {
key, err := scale.Marshal(big.NewInt(int64(i)))
if err != nil {
logger.Errorf("[ext_trie_blake2_256_ordered_root_version_1]: %s", err)
logger.Errorf("failed scale encoding value index %d: %s", i, err)
return 0
}
logger.Tracef(
Expand All @@ -859,17 +859,17 @@ func ext_trie_blake2_256_ordered_root_version_1(context unsafe.Pointer, dataSpan
// allocate memory for value and copy value to memory
ptr, err := runtimeCtx.Allocator.Allocate(32)
if err != nil {
logger.Errorf("[ext_trie_blake2_256_ordered_root_version_1]: %s", err)
logger.Errorf("failed allocating: %s", err)
return 0
}

hash, err := t.Hash()
if err != nil {
logger.Errorf("[ext_trie_blake2_256_ordered_root_version_1]: %s", err)
logger.Errorf("failed computing trie Merkle root hash: %s", err)
return 0
}

logger.Debugf("[ext_trie_blake2_256_ordered_root_version_1]: root hash is %s", hash)
logger.Debugf("root hash is %s", hash)
copy(memory[ptr:ptr+32], hash[:])
return C.int32_t(ptr)
}
Expand All @@ -890,7 +890,7 @@ func ext_trie_blake2_256_verify_proof_version_1(context unsafe.Pointer, rootSpan
var encodedProofNodes [][]byte
err := scale.Unmarshal(toDecProofs, &encodedProofNodes)
if err != nil {
logger.Errorf("[ext_trie_blake2_256_verify_proof_version_1]: %s", err)
logger.Errorf("failed scale decoding proof data: %s", err)
return C.int32_t(0)
}

Expand All @@ -902,7 +902,7 @@ func ext_trie_blake2_256_verify_proof_version_1(context unsafe.Pointer, rootSpan

err = proof.Verify(encodedProofNodes, trieRoot, key, value)
if err != nil {
logger.Errorf("[ext_trie_blake2_256_verify_proof_version_1]: %s", err)
logger.Errorf("failed proof verification: %s", err)
return C.int32_t(0)
}

Expand Down Expand Up @@ -1294,7 +1294,7 @@ func ext_hashing_blake2_128_version_1(context unsafe.Pointer, dataSpan C.int64_t

hash, err := common.Blake2b128(data)
if err != nil {
logger.Errorf("[ext_hashing_blake2_128_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand All @@ -1320,7 +1320,7 @@ func ext_hashing_blake2_256_version_1(context unsafe.Pointer, dataSpan C.int64_t

hash, err := common.Blake2bHash(data)
if err != nil {
logger.Errorf("[ext_hashing_blake2_256_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand All @@ -1344,7 +1344,7 @@ func ext_hashing_keccak_256_version_1(context unsafe.Pointer, dataSpan C.int64_t

hash, err := common.Keccak256(data)
if err != nil {
logger.Errorf("[ext_hashing_keccak_256_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand Down Expand Up @@ -1387,7 +1387,7 @@ func ext_hashing_twox_256_version_1(context unsafe.Pointer, dataSpan C.int64_t)

hash, err := common.Twox256(data)
if err != nil {
logger.Errorf("[ext_hashing_twox_256_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand All @@ -1410,7 +1410,7 @@ func ext_hashing_twox_128_version_1(context unsafe.Pointer, dataSpan C.int64_t)

hash, err := common.Twox128Hash(data)
if err != nil {
logger.Errorf("[ext_hashing_twox_128_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand All @@ -1436,7 +1436,7 @@ func ext_hashing_twox_64_version_1(context unsafe.Pointer, dataSpan C.int64_t) C

hash, err := common.Twox64(data)
if err != nil {
logger.Errorf("[ext_hashing_twox_64_version_1]: %s", err)
logger.Errorf("failed hashing data: %s", err)
return 0
}

Expand Down Expand Up @@ -1838,7 +1838,7 @@ func ext_storage_append_version_1(context unsafe.Pointer, keySpan, valueSpan C.i

err := storageAppend(storage, key, cp)
if err != nil {
logger.Errorf("[ext_storage_append_version_1]: %s", err)
logger.Errorf("failed appending to storage: %s", err)
}
}

Expand Down Expand Up @@ -1881,10 +1881,7 @@ func ext_storage_clear_prefix_version_1(context unsafe.Pointer, prefixSpan C.int
prefix := asMemorySlice(instanceContext, prefixSpan)
logger.Debugf("prefix: 0x%x", prefix)

err := storage.ClearPrefix(prefix)
if err != nil {
logger.Errorf("[ext_storage_clear_prefix_version_1]: %s", err)
}
storage.ClearPrefix(prefix)
}

//export ext_storage_clear_prefix_version_2
Expand All @@ -1903,7 +1900,7 @@ func ext_storage_clear_prefix_version_2(context unsafe.Pointer, prefixSpan, lim
var limit []byte
err := scale.Unmarshal(limitBytes, &limit)
if err != nil {
logger.Warnf("[ext_storage_clear_prefix_version_2]: cannot generate limit: %s", err)
logger.Warnf("failed scale decoding limit: %s", err)
ret, _ := toWasmMemory(instanceContext, nil)
return C.int64_t(ret)
}
Expand Down Expand Up @@ -2099,7 +2096,7 @@ func ext_storage_rollback_transaction_version_1(context unsafe.Pointer) {

//export ext_storage_commit_transaction_version_1
func ext_storage_commit_transaction_version_1(context unsafe.Pointer) {
logger.Debug("[ext_storage_commit_transaction_version_1] executing...")
logger.Debug("executing...")
instanceContext := wasm.IntoInstanceContext(context)
instanceContext.Data().(*runtime.Context).Storage.CommitStorageTransaction()
}
Expand Down