smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2024-11-10 10:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: contract, tests, clippy (#11)

Browse Source
This commit is contained in:
MiniFrenchBread 2024-01-26 16:13:18 +08:00 committed by GitHub
parent 0c123500c9
commit 7667e02019
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/append_merkle/src/lib.rs
View File

@ -7,7 +7,7 @@ use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use std::fmt::Debug; use std::fmt::Debug;
use std::marker::PhantomData; use std::marker::PhantomData;
use tracing::{debug, warn}; use tracing::warn;
pub use crate::merkle_tree::{Algorithm, HashElement, MerkleTreeInitialData, MerkleTreeRead}; pub use crate::merkle_tree::{Algorithm, HashElement, MerkleTreeInitialData, MerkleTreeRead};
pub use proof::{Proof, RangeProof}; pub use proof::{Proof, RangeProof};
@ -217,7 +217,7 @@ impl<E: HashElement, A: Algorithm<E>> AppendMerkleTree<E, A> {
tx_merkle_nodes = tx_merkle_nodes tx_merkle_nodes = tx_merkle_nodes
.into_iter() .into_iter()
.filter_map(|(height, data)| { .filter_map(|(height, data)| {
if height >= self.leaf_height + 1 { if height > self.leaf_height {
Some((height - self.leaf_height - 1, data)) Some((height - self.leaf_height - 1, data))
} else { } else {
None None

8
common/append_merkle/src/proof.rs
View File

@ -112,12 +112,10 @@ impl<T: HashElement> Proof<T> {
if !in_subtree { if !in_subtree {
if *is_left { if *is_left {
in_subtree = true; in_subtree = true;
} else if i < tx_merkle_nodes.len() {
root_pos += 1 << tx_merkle_nodes[i].0;
} else { } else {
if i < tx_merkle_nodes.len() { break;
root_pos += 1 << tx_merkle_nodes[i].0;
} else {
break;
}
} }
} else { } else {
subtree_pos <<= 1; subtree_pos <<= 1;

1
tests/config/node_config.py
View File

@ -35,7 +35,6 @@ TX_PARAMS = {
"gasPrice": 10_000_000_000, "gasPrice": 10_000_000_000,
"gas": 10_000_000, "gas": 10_000_000,
"from": GENESIS_ACCOUNT.address, "from": GENESIS_ACCOUNT.address,
"gas": 2_000_000,
} }
GENESIS_PRIV_KEY1 = "9a6d3ba2b0c7514b16a006ee605055d71b9edfad183aeb2d9790e9d4ccced471" GENESIS_PRIV_KEY1 = "9a6d3ba2b0c7514b16a006ee605055d71b9edfad183aeb2d9790e9d4ccced471"

4
tests/test_framework/blockchain_node.py
View File

@ -282,12 +282,12 @@ class BlockchainNode(TestNode):
token_contract, _ = deploy_contract(self.token_contract_path) token_contract, _ = deploy_contract(self.token_contract_path)
self.log.debug("ERC20 deployed") self.log.debug("ERC20 deployed")
flow_contract, flow_contract_hash = deploy_contract( flow_contract, flow_contract_hash = deploy_contract(
self.contract_path, [token_contract.address] self.contract_path, ["0x0000000000000000000000000000000000000000", 100, 0]
) )
self.log.debug("Flow deployed") self.log.debug("Flow deployed")
mine_contract, _ = deploy_contract( mine_contract, _ = deploy_contract(
self.mine_contract_path, self.mine_contract_path,
[flow_contract.address, 0], [flow_contract.address, "0x0000000000000000000000000000000000000000", 7],
) )
self.log.debug("Mine deployed") self.log.debug("Mine deployed")
self.log.info("All contracts deployed") self.log.info("All contracts deployed")

2
zerog-storage-contracts

@ -1 +1 @@
Subproject commit aa642b673c5571586a9d57e70c09c774601db6fb Subproject commit 951c02992e2a03eb47e41eb840392ec824639640