mirror of
https://github.com/mimblewimble/grin.git
synced 2025-01-21 19:41:08 +03:00
1609b041b1
* create 2.0.0 branch * fix humansize version * update grin.yml version * PoW HardFork (#2866) * allow version 2 blocks for next 6 months * add cuckarood.rs with working tests * switch cuckaroo to cuckarood at right heights * reorder to reduce conditions * remove _ prefix on used args; fix typo * Make Valid Header Version dependant on ChainType * Rustfmt * Add tests, uncomment header v2 * Rustfmt * Add FLOONET_FIRST_HARD_FORK height and simplify logic * assume floonet stays closer to avg 60s block time * move floonet hf forward by half a day * update version in new block when previous no longer valid * my next commit:-) * micro optimization * Support new Bulletproof rewind scheme (#2848) * Update keychain with new rewind scheme * Refactor: proof builder trait * Update tests, cleanup * rustfmt * Move conversion of SwitchCommitmentType * Add proof build trait to tx builders * Cache hashes in proof builders * Proof builder tests * Add ViewKey struct * Fix some warnings * Zeroize proof builder secrets on drop * Modify mine_block to use wallet V2 API (#2892) * update mine_block to use V2 wallet API * rustfmt * Add version endpoint to node API, rename pool/push (#2897) * add node version API, tweak pool/push parameter * rustfmt * Upate version api call (#2899) * Update version number for next (potential) release * zeroize: Upgrade to v0.9 (#2914) * zeroize: Upgrade to v0.9 * missed Cargo.lock * [PENDING APPROVAL] put phase outs of C32 and beyond on hold (#2714) * put phase outs of C32 and beyond on hold * update tests for phaseouts on hold * Don't wait for p2p-server thread (#2917) Currently p2p.stop() stops and wait for all peers to exit, that's basically all we need. However we also run a TCP listener in this thread which is blocked on `accept` most of the time. We do an attempt to stop it but it would work only if we get an incoming connection during the shutdown, which is a week guarantee. This fix remove joining to p2p-server thread, it stops all peers and makes an attempt to stop the listener. Fixes [#2906] * rustfmt
48 lines
1.6 KiB
Rust
48 lines
1.6 KiB
Rust
// Copyright 2018 The Grin Developers
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Transaction integration tests
|
|
|
|
pub mod common;
|
|
|
|
use self::core::core::{Output, OutputFeatures};
|
|
use self::core::libtx::proof;
|
|
use self::core::ser;
|
|
use self::keychain::{ExtKeychain, Keychain};
|
|
use grin_core as core;
|
|
use grin_keychain as keychain;
|
|
|
|
#[test]
|
|
fn test_output_ser_deser() {
|
|
let keychain = ExtKeychain::from_random_seed(false).unwrap();
|
|
let key_id = ExtKeychain::derive_key_id(1, 1, 0, 0, 0);
|
|
let switch = &keychain::SwitchCommitmentType::Regular;
|
|
let commit = keychain.commit(5, &key_id, switch).unwrap();
|
|
let builder = proof::ProofBuilder::new(&keychain);
|
|
let proof = proof::create(&keychain, &builder, 5, &key_id, switch, commit, None).unwrap();
|
|
|
|
let out = Output {
|
|
features: OutputFeatures::Plain,
|
|
commit: commit,
|
|
proof: proof,
|
|
};
|
|
|
|
let mut vec = vec![];
|
|
ser::serialize(&mut vec, &out).expect("serialized failed");
|
|
let dout: Output = ser::deserialize(&mut &vec[..]).unwrap();
|
|
|
|
assert_eq!(dout.features, OutputFeatures::Plain);
|
|
assert_eq!(dout.commit, out.commit);
|
|
assert_eq!(dout.proof, out.proof);
|
|
}
|