Fetch parity-common crates from crates.io (#9410)
* Fetch `parity-common` crates from crates.io * Add doc tests from `patricia-trie` to `patricia-trie-ethereum` Fix/update a few deps * [ethkey] upgrade ethereum-types * [whisper] update deps * [network] deps * [network-devp2p] deps * [journaldb] deps * [fastmap] deps * [miner] deps and test fixes * [machine] deps * [json] deps * [hw] deps * [ethash] deps * [registrar] deps * Update a few more dependencies with new ethabi-* * [updater] Update deps * deps * [ethcore] Update deps * Use new parity-snappy and parity-rocksdb crates * Updated submodules * Use parity-snappy 0.1 * Use kvdb-rocksdb 0.1.2 * Don't use latest ethereum/tests * Fix merge conflicts errors * Remove superseeded comment * Address grumbles: add newlines, add/remove spaces
This commit is contained in:
@@ -795,7 +795,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
TWO_POW_96 => a >> 96,
|
||||
TWO_POW_224 => a >> 224,
|
||||
TWO_POW_248 => a >> 248,
|
||||
_ => a.overflowing_div(b).0,
|
||||
_ => a / b,
|
||||
}
|
||||
} else {
|
||||
U256::zero()
|
||||
@@ -805,7 +805,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
let a = self.stack.pop_back();
|
||||
let b = self.stack.pop_back();
|
||||
self.stack.push(if !b.is_zero() {
|
||||
a.overflowing_rem(b).0
|
||||
a % b
|
||||
} else {
|
||||
U256::zero()
|
||||
});
|
||||
@@ -821,7 +821,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
} else if a == min && b == !U256::zero() {
|
||||
min
|
||||
} else {
|
||||
let c = a.overflowing_div(b).0;
|
||||
let c = a / b;
|
||||
set_sign(c, sign_a ^ sign_b)
|
||||
});
|
||||
},
|
||||
@@ -832,7 +832,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
let b = get_and_reset_sign(ub).0;
|
||||
|
||||
self.stack.push(if !b.is_zero() {
|
||||
let c = a.overflowing_rem(b).0;
|
||||
let c = a % b;
|
||||
set_sign(c, sign_a)
|
||||
} else {
|
||||
U256::zero()
|
||||
@@ -920,7 +920,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
// upcast to 512
|
||||
let a5 = U512::from(a);
|
||||
let res = a5.overflowing_add(U512::from(b)).0;
|
||||
let x = res.overflowing_rem(U512::from(c)).0;
|
||||
let x = res % U512::from(c);
|
||||
U256::from(x)
|
||||
} else {
|
||||
U256::zero()
|
||||
@@ -934,7 +934,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
||||
self.stack.push(if !c.is_zero() {
|
||||
let a5 = U512::from(a);
|
||||
let res = a5.overflowing_mul(U512::from(b)).0;
|
||||
let x = res.overflowing_rem(U512::from(c)).0;
|
||||
let x = res % U512::from(c);
|
||||
U256::from(x)
|
||||
} else {
|
||||
U256::zero()
|
||||
|
||||
Reference in New Issue
Block a user